From 74572d578b14c20d53f2828f1a79114468812a15 Mon Sep 17 00:00:00 2001 From: EWSoftware Date: Sat, 1 Dec 2018 15:36:29 -0800 Subject: [PATCH] Various updates and fixes - Added spell checker configuration files. - Fixed up various code analysis issues and updated the code to use the latest language features throughout the code base. - Updated the Windows Forms controls and demos so that they look good on high DPI displays. --- Doc/Content/VersionHistory/2018.12.1.0.aml | 84 ++++++ Doc/Content/VersionHistory/VersionHistory.aml | 5 + Doc/ContentLayout.content | 7 +- Doc/EWSoftwarePDI.shfbproj | 3 +- Doc/EWSoftwarePDI.sln | 13 +- Doc/EWSoftwarePDI.sln.vsspell | 14 + MasterBuild.bat | 9 + PDIFiles/Sample.vcf | 6 +- Source/CSharpDemos.sln | 6 +- Source/CSharpDemos.sln.vsspell | 14 + .../CalendarBrowser/AboutDlg.Designer.cs | 42 +-- .../CSharpDemos/CalendarBrowser/AboutDlg.cs | 6 +- .../CalendarBrowser/AlarmControl.Designer.cs | 93 +++--- .../CalendarBrowser/AlarmControl.cs | 7 +- .../AttachmentsControl.Designer.cs | 49 +-- .../CalendarBrowser/AttachmentsControl.cs | 11 +- .../AttendeeControl.Designer.cs | 56 ++-- .../CalendarBrowser/AttendeeControl.cs | 6 +- .../CalendarBrowserForm.Designer.cs | 82 ++--- .../CalendarBrowser/CalendarBrowserForm.cs | 19 +- .../CalendarObjectDlg.Designer.cs | 258 ++++++++-------- .../CalendarBrowser/CalendarObjectDlg.cs | 36 +-- .../CalendarBrowser/CalendarObjectDlg.resx | 2 +- .../FreeBusyControl.Designer.cs | 34 +-- .../ObservanceRuleControl.Designer.cs | 88 +++--- .../Properties/AssemblyInfoShared.cs | 6 +- .../RecurrenceControl.Designer.cs | 60 ++-- .../CalendarBrowser/RecurrenceControl.cs | 41 ++- .../RequestStatusControl.Designer.cs | 26 +- .../TimeZoneListDlg.Designer.cs | 2 +- .../CalendarBrowser/TimeZoneListDlg.cs | 49 ++- .../CalendarBrowser/VFreeBusyDlg.Designer.cs | 112 +++---- .../CalendarBrowser/VFreeBusyDlg.cs | 6 +- .../CalendarBrowser/VTimeZoneDlg.Designer.cs | 36 +-- .../PDIWebDemoCS/App_Code/AssemblyInfo.cs | 10 +- .../PDIWebDemoCS/App_Code/Global.asax.cs | 4 +- .../PDIWebDemoCS/CalendarBrowser.aspx | 2 +- .../PDIWebDemoCS/CalendarBrowser.aspx.cs | 8 +- .../PDIWebDemoCS/EventRecurTestForm.aspx.cs | 2 +- .../PDIWebDemoCS/HolidayTestForm.aspx.cs | 32 +- .../PDIWebDemoCS/PDIWebDemoCS.vsspell | 17 ++ Source/CSharpDemos/PDIWebDemoCS/RFC2426.vcf | 6 +- .../PDIWebDemoCS/RRuleTestForm.aspx.cs | 7 +- .../PDIWebDemoCS/VCardBrowser.aspx | 2 +- .../PDIWebDemoCS/VCardBrowser.aspx.cs | 8 +- Source/CSharpDemos/PDIWebDemoCS/Web.config | 2 +- Source/CSharpDemos/PDIWebDemoCS/vwd.webinfo | 18 ++ .../PDIWinFormsTest/AboutDlg.Designer.cs | 42 +-- .../CSharpDemos/PDIWinFormsTest/AboutDlg.cs | 6 +- .../EventRecurTestForm.Designer.cs | 63 ++-- .../HolidayTestForm.Designer.cs | 70 ++--- .../PDIWinFormsTest/MainForm.Designer.cs | 26 +- .../PDIWinFormsTest/RRuleTestForm.Designer.cs | 49 +-- .../PDIWinFormsTest/RRuleTestForm.cs | 10 +- .../PDIWinFormsTest/TimeZoneRegInfo.cs | 6 +- .../VTimeZoneTestForm.Designer.cs | 72 ++--- .../vCardBrowser/AboutDlg.Designer.cs | 42 +-- Source/CSharpDemos/vCardBrowser/AboutDlg.cs | 6 +- .../vCardBrowser/AddressControl.Designer.cs | 92 +++--- .../vCardBrowser/EMailControl.Designer.cs | 28 +- .../vCardBrowser/LabelControl.Designer.cs | 34 +-- .../vCardBrowser/PhoneControl.Designer.cs | 46 +-- .../vCardBrowser/PhotoControl.Designer.cs | 26 +- .../CSharpDemos/vCardBrowser/PhotoControl.cs | 24 +- .../vCardBrowser/VCardBrowserForm.Designer.cs | 56 ++-- .../vCardBrowser/VCardBrowserForm.cs | 17 +- .../VCardPropertiesDlg.Designer.cs | 283 +++++++++--------- .../vCardBrowser/VCardPropertiesDlg.cs | 16 +- Source/Common.vsspell | 26 ++ Source/EWSPDI.sln | 2 + Source/EWSPDI.sln.vsspell | 14 + Source/EWSPDI/DateUtils.cs | 20 +- Source/EWSPDI/DayInstance.cs | 31 +- Source/EWSPDI/Duration.cs | 90 ++---- Source/EWSPDI/EWSoftware.PDI.csproj | 4 +- Source/EWSPDI/EWSoftware.PDI.csproj.vsspell | 17 ++ Source/EWSPDI/Expand.cs | 31 +- Source/EWSPDI/FixedHoliday.cs | 16 +- Source/EWSPDI/FloatingHoliday.cs | 16 +- Source/EWSPDI/Holiday.cs | 8 +- Source/EWSPDI/ISO8601Format.cs | 2 + Source/EWSPDI/LocalizedResources.cs | 13 +- Source/EWSPDI/Period.cs | 25 +- .../EWSPDI/Properties/AssemblyInfoShared.cs | 8 +- Source/EWSPDI/RecurDateTime.cs | 57 ++-- Source/EWSPDI/RecurOptsDataSource.cs | 24 +- Source/EWSPDI/Recurrence.cs | 105 +++---- Source/EWSPDI/RecurrenceEnumerator.cs | 14 +- Source/EWSPDI/StringCollection.cs | 8 +- Source/EWSPDI/UniqueIntegerCollection.cs | 62 ++-- Source/EWSPDI/YearlyFrequency.cs | 23 +- .../Binding/ChildPropertyDescriptor.cs | 20 +- .../EWSPDIData/Binding/ExtendedBindingList.cs | 34 +-- Source/EWSPDIData/Binding/PropertyComparer.cs | 10 +- Source/EWSPDIData/DateTimeInstance.cs | 34 +-- Source/EWSPDIData/EWSoftware.PDI.Data.csproj | 4 +- Source/EWSPDIData/LocalizedResources.cs | 15 +- Source/EWSPDIData/PDIObject.cs | 6 +- .../EWSPDIData/PDIObjects/CalendarObject.cs | 6 +- .../EWSPDIData/PDIObjects/ObservanceRule.cs | 17 +- .../EWSPDIData/PDIObjects/RecurringObject.cs | 25 +- Source/EWSPDIData/PDIObjects/VAlarm.cs | 15 +- Source/EWSPDIData/PDIObjects/VCard.cs | 54 ++-- .../EWSPDIData/PDIObjects/VCardCollection.cs | 2 + Source/EWSPDIData/PDIObjects/VEvent.cs | 26 +- Source/EWSPDIData/PDIObjects/VFreeBusy.cs | 19 +- Source/EWSPDIData/PDIObjects/VJournal.cs | 25 +- Source/EWSPDIData/PDIObjects/VNote.cs | 17 +- .../EWSPDIData/PDIObjects/VNoteCollections.cs | 2 + Source/EWSPDIData/PDIObjects/VTimeZone.cs | 19 +- Source/EWSPDIData/PDIObjects/VToDo.cs | 25 +- Source/EWSPDIData/PDIParser/NameToValue.cs | 46 +-- Source/EWSPDIData/PDIParser/PDIParser.cs | 25 +- .../PDIParser/PDIParserException.cs | 27 +- .../EWSPDIData/PDIParser/VCalendarParser.cs | 18 +- Source/EWSPDIData/PDIParser/VCardParser.cs | 16 +- Source/EWSPDIData/PDIParser/VNoteParser.cs | 18 +- .../PDIProperties/ActionProperty.cs | 31 +- .../PDIProperties/AddressProperty.cs | 25 +- .../AddressPropertyCollection.cs | 8 +- .../EWSPDIData/PDIProperties/AgentProperty.cs | 23 +- .../PDIProperties/AgentPropertyCollection.cs | 8 +- .../PDIProperties/AttachProperty.cs | 21 +- .../PDIProperties/AttendeeProperty.cs | 93 ++---- .../AttendeePropertyCollection.cs | 13 +- .../PDIProperties/BaseDateTimeProperty.cs | 29 +- .../EWSPDIData/PDIProperties/BaseProperty.cs | 66 ++-- .../PDIProperties/BirthDateProperty.cs | 21 +- .../EWSPDIData/PDIProperties/BodyProperty.cs | 20 +- .../PDIProperties/CalendarScaleProperty.cs | 20 +- .../PDIProperties/CategoriesProperty.cs | 33 +- .../PDIProperties/ClassificationProperty.cs | 22 +- .../PDIProperties/CommentProperty.cs | 20 +- .../PDIProperties/CompletedDateProperty.cs | 22 +- .../PDIProperties/ContactProperty.cs | 20 +- .../ContactPropertyCollection.cs | 8 +- .../PDIProperties/CustomProperty.cs | 26 +- .../PDIProperties/CustomPropertyCollection.cs | 9 +- .../PDIProperties/DateCreatedProperty.cs | 18 +- .../PDIProperties/DaylightProperty.cs | 23 +- .../PDIProperties/DescriptionProperty.cs | 21 +- .../PDIProperties/DueDateProperty.cs | 21 +- .../PDIProperties/DurationProperty.cs | 26 +- .../EWSPDIData/PDIProperties/EMailProperty.cs | 36 +-- .../PDIProperties/EMailPropertyCollection.cs | 17 +- .../PDIProperties/EndDateProperty.cs | 21 +- .../PDIProperties/ExDateProperty.cs | 21 +- .../PDIProperties/ExDatePropertyCollection.cs | 8 +- .../PDIProperties/ExRuleProperty.cs | 10 +- .../PDIProperties/FormattedNameProperty.cs | 30 +- .../PDIProperties/FreeBusyProperty.cs | 33 +- .../FreeBusyPropertyCollection.cs | 9 +- .../GeographicPositionProperty.cs | 23 +- .../EWSPDIData/PDIProperties/LabelProperty.cs | 22 +- .../PDIProperties/LabelPropertyCollection.cs | 17 +- .../PDIProperties/LastModifiedProperty.cs | 26 +- .../PDIProperties/LastRevisionProperty.cs | 21 +- .../PDIProperties/LocationProperty.cs | 21 +- .../EWSPDIData/PDIProperties/LogoProperty.cs | 16 +- .../PDIProperties/MailerProperty.cs | 21 +- .../PDIProperties/MethodProperty.cs | 30 +- .../PDIProperties/MimeNameProperty.cs | 20 +- .../PDIProperties/MimeSourceProperty.cs | 19 +- .../EWSPDIData/PDIProperties/NameProperty.cs | 24 +- .../PDIProperties/NicknameProperty.cs | 30 +- .../EWSPDIData/PDIProperties/NoteProperty.cs | 22 +- .../PDIProperties/NotePropertyCollection.cs | 8 +- .../PDIProperties/OrganizationProperty.cs | 35 +-- .../PDIProperties/OrganizerProperty.cs | 19 +- .../PDIProperties/PercentCompleteProperty.cs | 27 +- .../EWSPDIData/PDIProperties/PhotoProperty.cs | 20 +- .../PDIProperties/PriorityProperty.cs | 28 +- .../PDIProperties/ProductIdProperty.cs | 28 +- .../PDIProperties/PublicKeyProperty.cs | 20 +- .../EWSPDIData/PDIProperties/RDateProperty.cs | 42 +-- .../PDIProperties/RDatePropertyCollection.cs | 12 +- .../EWSPDIData/PDIProperties/RRuleProperty.cs | 26 +- .../PDIProperties/RecurrenceCountProperty.cs | 28 +- .../PDIProperties/RecurrenceIdProperty.cs | 23 +- .../PDIProperties/RelatedToProperty.cs | 26 +- .../RelatedToPropertyCollection.cs | 9 +- .../PDIProperties/RepeatProperty.cs | 28 +- .../PDIProperties/RequestStatusProperty.cs | 23 +- .../RequestStatusPropertyCollection.cs | 15 +- .../PDIProperties/ResourcesProperty.cs | 31 +- .../EWSPDIData/PDIProperties/RoleProperty.cs | 21 +- .../PDIProperties/SequenceProperty.cs | 28 +- .../PDIProperties/SortStringProperty.cs | 20 +- .../EWSPDIData/PDIProperties/SoundProperty.cs | 31 +- .../PDIProperties/StartDateProperty.cs | 21 +- .../PDIProperties/StatusProperty.cs | 40 +-- .../PDIProperties/SummaryProperty.cs | 25 +- .../PDIProperties/TelephoneProperty.cs | 33 +- .../TelephonePropertyCollection.cs | 17 +- .../PDIProperties/TimeStampProperty.cs | 21 +- .../PDIProperties/TimeTransparencyProperty.cs | 25 +- .../PDIProperties/TimeZoneIdProperty.cs | 28 +- .../PDIProperties/TimeZoneNameProperty.cs | 19 +- .../TimeZoneNamePropertyCollection.cs | 8 +- .../PDIProperties/TimeZoneOffsetProperty.cs | 39 +-- .../PDIProperties/TimeZoneProperty.cs | 26 +- .../PDIProperties/TimeZoneUrlProperty.cs | 20 +- .../EWSPDIData/PDIProperties/TitleProperty.cs | 21 +- .../PDIProperties/TriggerProperty.cs | 40 +-- .../PDIProperties/UniqueIdProperty.cs | 21 +- .../EWSPDIData/PDIProperties/UrlProperty.cs | 18 +- .../EWSoftware.PDI.Web.Controls.csproj | 4 +- Source/EWSPDIWeb/LocalizedResources.cs | 16 +- Source/EWSPDIWeb/RecurrencePattern.cs | 68 +++-- Source/EWSPDIWeb/Scripts/DayInstance.js | 14 +- Source/EWSPDIWeb/Scripts/RecurrencePattern.js | 148 ++++----- Source/EWSPDIWinForms/AdvancedPattern.resx | 187 ++++++------ Source/EWSPDIWinForms/BrowseControl.cs | 17 +- Source/EWSPDIWinForms/BrowseControl.resx | 119 ++++---- Source/EWSPDIWinForms/DailyPattern.resx | 10 +- .../EWSoftware.PDI.Windows.Forms.csproj | 13 +- Source/EWSPDIWinForms/HolidayManager.cs | 14 +- .../HolidayPropertiesDlg.Designer.cs | 5 + Source/EWSPDIWinForms/HolidayPropertiesDlg.cs | 16 +- .../EWSPDIWinForms/HolidayPropertiesDlg.resx | 24 +- Source/EWSPDIWinForms/HourlyPattern.resx | 32 +- Source/EWSPDIWinForms/LocalizedResources.cs | 13 +- Source/EWSPDIWinForms/MinutelyPattern.resx | 32 +- Source/EWSPDIWinForms/MonthlyPattern.resx | 80 ++--- Source/EWSPDIWinForms/RecurrencePattern.cs | 29 +- Source/EWSPDIWinForms/RecurrencePattern.resx | 102 +++---- .../RecurrencePropertiesDlg.Designer.cs | 1 + .../EWSPDIWinForms/RecurrencePropertiesDlg.cs | 26 +- .../RecurrencePropertiesDlg.resx | 20 +- Source/EWSPDIWinForms/SecondlyPattern.resx | 32 +- Source/EWSPDIWinForms/WeeklyPattern.resx | 74 ++--- Source/EWSPDIWinForms/YearlyPattern.resx | 94 +++--- Source/PDIWebDemo.sln | 1 + Source/PDIWebDemo.sln.vsspell | 12 +- Source/VBNetDemos.sln | 2 + Source/VBNetDemos.sln.vsspell | 14 + .../CalendarBrowser/AboutDlg.Designer.vb | 42 +-- Source/VBNetDemos/CalendarBrowser/AboutDlg.vb | 10 +- .../CalendarBrowser/AlarmControl.Designer.vb | 93 +++--- .../CalendarBrowser/AlarmControl.vb | 2 - .../AttachmentsControl.Designer.vb | 49 +-- .../CalendarBrowser/AttachmentsControl.vb | 5 - .../AttendeeControl.Designer.vb | 56 ++-- .../CalendarBrowser/AttendeeControl.vb | 7 +- .../CalendarBrowserForm.Designer.vb | 135 ++++----- .../CalendarBrowser/CalendarBrowserForm.vb | 70 ++--- .../CalendarObjectDlg.Designer.vb | 256 ++++++++-------- .../CalendarBrowser/CalendarObjectDlg.vb | 3 - .../FreeBusyControl.Designer.vb | 34 +-- .../CalendarBrowser/FreeBusyControl.vb | 2 - .../My Project/AssemblyInfoShared.vb | 6 +- .../ObservanceRuleControl.Designer.vb | 88 +++--- .../CalendarBrowser/ObservanceRuleControl.vb | 13 +- .../RecurrenceControl.Designer.vb | 60 ++-- .../CalendarBrowser/RecurrenceControl.vb | 41 +-- .../RequestStatusControl.Designer.vb | 26 +- .../CalendarBrowser/RequestStatusControl.vb | 5 - .../TimeZoneListDlg.Designer.vb | 2 +- .../CalendarBrowser/TimeZoneListDlg.vb | 44 +-- .../CalendarBrowser/VFreeBusyDlg.Designer.vb | 112 +++---- .../CalendarBrowser/VFreeBusyDlg.vb | 3 - .../CalendarBrowser/VTimeZoneDlg.Designer.vb | 36 +-- .../CalendarBrowser/VTimeZoneDlg.vb | 5 - .../PDIWebDemoVB/App_Code/AssemblyInfo.vb | 11 +- .../PDIWebDemoVB/App_Code/Global.asax.vb | 3 - .../PDIWebDemoVB/CalendarBrowser.aspx | 2 +- .../PDIWebDemoVB/CalendarBrowser.aspx.vb | 14 +- .../CalendarObjectDetails.aspx.vb | 8 +- .../PDIWebDemoVB/EventRecurTestForm.aspx.vb | 12 +- .../PDIWebDemoVB/FreeBusyDetails.aspx.vb | 8 +- .../PDIWebDemoVB/HolidayTestForm.aspx.vb | 41 ++- .../PDIWebDemoVB/MasterPage.master.vb | 6 +- .../PDIWebDemoVB/PDIWebDemoVB.vsspell | 17 ++ Source/VBNetDemos/PDIWebDemoVB/RFC2426.vcf | 6 +- .../PDIWebDemoVB/RRuleTestForm.aspx.vb | 15 +- .../VBNetDemos/PDIWebDemoVB/ShowImage.aspx.vb | 8 - .../VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx | 2 +- .../PDIWebDemoVB/VCardBrowser.aspx.vb | 14 +- .../PDIWebDemoVB/VCardDetails.aspx.vb | 6 - .../PDIWebDemoVB/VTimeZoneTestForm.aspx.vb | 6 - Source/VBNetDemos/PDIWebDemoVB/Web.config | 2 +- Source/VBNetDemos/PDIWebDemoVB/vwd.webinfo | 18 ++ .../PDIWinFormsTest/AboutDlg.Designer.vb | 42 +-- Source/VBNetDemos/PDIWinFormsTest/AboutDlg.vb | 21 +- .../EventRecurTestForm.Designer.vb | 58 ++-- .../PDIWinFormsTest/EventRecurTestForm.vb | 1 - .../HolidayTestForm.Designer.vb | 75 +++-- .../PDIWinFormsTest/HolidayTestForm.vb | 2 +- .../PDIWinFormsTest/MainForm.Designer.vb | 26 +- .../PDIWinFormsTest/RRuleTestForm.Designer.vb | 49 +-- .../PDIWinFormsTest/RRuleTestForm.vb | 10 +- .../PDIWinFormsTest/TimeZoneRegInfo.vb | 2 + .../VTimeZoneTestForm.Designer.vb | 72 ++--- .../PDIWinFormsTest/VTimeZoneTestForm.vb | 1 - .../vCardBrowser/AboutDlg.Designer.vb | 42 +-- Source/VBNetDemos/vCardBrowser/AboutDlg.vb | 13 +- .../vCardBrowser/AddressControl.Designer.vb | 92 +++--- .../VBNetDemos/vCardBrowser/AddressControl.vb | 1 - .../vCardBrowser/EMailControl.Designer.vb | 28 +- .../VBNetDemos/vCardBrowser/EMailControl.vb | 1 - .../vCardBrowser/LabelControl.Designer.vb | 36 +-- .../VBNetDemos/vCardBrowser/LabelControl.vb | 3 +- .../vCardBrowser/PhoneControl.Designer.vb | 44 +-- .../VBNetDemos/vCardBrowser/PhoneControl.vb | 3 +- .../vCardBrowser/PhotoControl.Designer.vb | 26 +- .../VBNetDemos/vCardBrowser/PhotoControl.vb | 2 + .../vCardBrowser/VCardBrowserForm.Designer.vb | 154 +++++----- .../vCardBrowser/VCardBrowserForm.vb | 19 +- .../VCardPropertiesDlg.Designer.vb | 281 ++++++++--------- .../vCardBrowser/VCardPropertiesDlg.vb | 5 +- 310 files changed, 4318 insertions(+), 5089 deletions(-) create mode 100644 Doc/Content/VersionHistory/2018.12.1.0.aml create mode 100644 Doc/EWSoftwarePDI.sln.vsspell create mode 100644 Source/CSharpDemos.sln.vsspell create mode 100644 Source/CSharpDemos/PDIWebDemoCS/PDIWebDemoCS.vsspell create mode 100644 Source/Common.vsspell create mode 100644 Source/EWSPDI.sln.vsspell create mode 100644 Source/EWSPDI/EWSoftware.PDI.csproj.vsspell create mode 100644 Source/VBNetDemos.sln.vsspell create mode 100644 Source/VBNetDemos/PDIWebDemoVB/PDIWebDemoVB.vsspell diff --git a/Doc/Content/VersionHistory/2018.12.1.0.aml b/Doc/Content/VersionHistory/2018.12.1.0.aml new file mode 100644 index 0000000..06bbcc7 --- /dev/null +++ b/Doc/Content/VersionHistory/2018.12.1.0.aml @@ -0,0 +1,84 @@ + + + + + Release notes for version 2018.12.1.0. + + +
+ Breaking Changes + + + + + Removed the VTimeZoneCollection.Lock property. Use the new +M:EWSoftware.PDI.Objects.VTimeZoneCollection.AcquireReaderLock(System.Int32,System.Boolean), +M:EWSoftware.PDI.Objects.VTimeZoneCollection.ReleaseReaderLock, +M:EWSoftware.PDI.Objects.VTimeZoneCollection.AcquireWriterLock(System.Int32), +and M:EWSoftware.PDI.Objects.VTimeZoneCollection.ReleaseWriterLock +methods instead + + + + Updated DateUtils.FromISO8601String so that if the date parts are +outside the expected year, month, and/or day ranges, it adjusts them to the minimum/maximum automatically rather +than throwing an exception. This may change the behavior of your application if it expects it to throw an +exception in these cases. + + + + Updated the Windows Forms controls and demos so that they look better on high DPI displays. +This may affect the layout of the controls in your forms if you make use of them. + + + + + +
+ +
+ Other Changes in This Release + + + + + Updated the EWSoftware.PDI and EWSoftware.PDI.Data +projects to support .NET Standard 2.0. The NuGet packages now target .NET 4.0 and later and .NET Standard 2.0. +All assembly projects have been updated to use the new .NET SDK project format to make it easier to generate the +NuGet packages. The EWSoftare.PDI.Web.Controls and EWSoftware.PDI.Windows.Forms +projects only target .NET 4.0 as in prior releases. + + + + Fixed up various code analysis issues and updated the code to use the latest language features +throughout the code base. + + + + Updated the PDIDatesTest, PDIParserTest, and +RFC2445RecurTest demo console applications to be .NET Core 2.1 applications. + + + + Updated all Windows Forms and web applications to use .NET 4.7.2 and enabled high DPI support +in the Windows Forms applications. + + + + Added EWSoftware.PDI.WinForms.Design.csproj to allow updating the Windows +Forms controls in the native Windows Forms designer. The EWSoftware.PDI.WinForms.csproj +project now uses the newer .NET SDK project format and is used to build the NuGet package. This format does not +currently support updating the Windows Forms user controls in the designer. + + + + + +
+ + + + + + + diff --git a/Doc/Content/VersionHistory/VersionHistory.aml b/Doc/Content/VersionHistory/VersionHistory.aml index bd4a993..cd9ee94 100644 --- a/Doc/Content/VersionHistory/VersionHistory.aml +++ b/Doc/Content/VersionHistory/VersionHistory.aml @@ -15,6 +15,11 @@ Data Interchange (PDI) Library over the life of the project.Select a version below to see a description of its changes. + + + + + diff --git a/Doc/ContentLayout.content b/Doc/ContentLayout.content index ab881fd..ee3208c 100644 --- a/Doc/ContentLayout.content +++ b/Doc/ContentLayout.content @@ -106,7 +106,7 @@ - + @@ -117,6 +117,11 @@ + + + + + diff --git a/Doc/EWSoftwarePDI.shfbproj b/Doc/EWSoftwarePDI.shfbproj index f274ea3..329a3d4 100644 --- a/Doc/EWSoftwarePDI.shfbproj +++ b/Doc/EWSoftwarePDI.shfbproj @@ -49,7 +49,7 @@ Personal Data Interchange ASP.NET web server control designers developed by Eric Woodruff. Personal Data Interchange Windows Forms controls developed by Eric Woodruff. - 2018.11.17.0 + 2018.12.1.0 @@ -187,6 +187,7 @@ + diff --git a/Doc/EWSoftwarePDI.sln b/Doc/EWSoftwarePDI.sln index 9dbe62c..ea5693f 100644 --- a/Doc/EWSoftwarePDI.sln +++ b/Doc/EWSoftwarePDI.sln @@ -1,10 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.106 MinimumVisualStudioVersion = 10.0.40219.1 Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "EWSoftwarePDI", "EWSoftwarePDI.shfbproj", "{5608842E-7D2D-40F9-81C0-4576B8490412}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36AF73CD-C5EF-4C51-A551-A09A4494DD01}" + ProjectSection(SolutionItems) = preProject + ..\Source\Common.vsspell = ..\Source\Common.vsspell + EWSoftwarePDI.sln.vsspell = EWSoftwarePDI.sln.vsspell + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -19,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {226E989B-D509-4A02-8580-20B1434D7EBC} + EndGlobalSection EndGlobal diff --git a/Doc/EWSoftwarePDI.sln.vsspell b/Doc/EWSoftwarePDI.sln.vsspell new file mode 100644 index 0000000..f1ff46e --- /dev/null +++ b/Doc/EWSoftwarePDI.sln.vsspell @@ -0,0 +1,14 @@ + + + + True + + True + True + True + ..\Source\Common.vsspell + True + + True + \ No newline at end of file diff --git a/MasterBuild.bat b/MasterBuild.bat index b2dc07f..6ce59e4 100644 --- a/MasterBuild.bat +++ b/MasterBuild.bat @@ -1,6 +1,15 @@ @ECHO OFF CLS +RD /S /Q .\Deployment + +MD .\Deployment + +DEL Source\EWSPDI\bin\Release\*.nupkg +DEL Source\EWSPDIData\bin\Release\*.nupkg +DEL Source\EWSPDIWeb\bin\Release\*.nupkg +DEL Source\EWSPDIWinForms\bin\Release\*.nupkg + IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\MSBuild.exe" IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\bin\MSBuild.exe" IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\bin\MSBuild.exe" diff --git a/PDIFiles/Sample.vcf b/PDIFiles/Sample.vcf index 97bb3cd..ca73588 100644 --- a/PDIFiles/Sample.vcf +++ b/PDIFiles/Sample.vcf @@ -113,7 +113,9 @@ NOTE:Just a little test note URL:http://www.ewoodruff.us TZ;VALUE=TEXT:(GMT-08:00) Pacific Time (US & Canada)\; Tijuana GEO:47.551324;-117.644544 -REV:2014-12-27T23:56:07Z +REV:2018-11-22T22:38:33Z UID:687DF7A7-8168-4BD8-928C-5665B6AEED74 -LOGO;VALUE=URI;TYPE=PNG:https://github.com/EWSoftware/PDI/blob/master/NuGet/EWSPDI.png +PHOTO;VALUE=URI;TYPE=JPEG:http://www.EWoodruff.us/Images/Avatar.jpg +LOGO;VALUE=URI;TYPE=PNG:https://raw.githubusercontent.com/EWSoftware/PDI/ma + ster/EWSPDI.png END:VCARD diff --git a/Source/CSharpDemos.sln b/Source/CSharpDemos.sln index 5054c56..bd6fe5e 100644 --- a/Source/CSharpDemos.sln +++ b/Source/CSharpDemos.sln @@ -11,6 +11,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D3E23A2C-E571-4DF2-BCA1-172B2C994300}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + Common.vsspell = Common.vsspell + CSharpDemos.sln.vsspell = CSharpDemos.sln.vsspell EWSPDIDemos.ruleset = EWSPDIDemos.ruleset EndProjectSection EndProject @@ -20,8 +22,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EWSoftware.PDI.Data", "EWSP EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EWSoftware.PDI.Windows.Forms", "EWSPDIWinForms\EWSoftware.PDI.Windows.Forms.csproj", "{AF3E8BED-A706-4C25-8379-2882641A221A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EWSoftware.PDI.WinForms.Design", "EWSPDIWinForms\EWSoftware.PDI.WinForms.Design.csproj", "{DBD186A2-8160-4BF3-92D4-61BF262F0CA2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PDIDatesTest", "CSharpDemos\PDIDatesTest\PDIDatesTest.csproj", "{A087FDCB-A669-4364-A8BB-C990CC5AB743}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PDIParserTest", "CSharpDemos\PDIParserTest\PDIParserTest.csproj", "{A5B3787A-2FEC-4A84-BA0D-E0E0D6119638}" @@ -58,8 +58,6 @@ Global {AF3E8BED-A706-4C25-8379-2882641A221A}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF3E8BED-A706-4C25-8379-2882641A221A}.Release|Any CPU.ActiveCfg = Release|Any CPU {AF3E8BED-A706-4C25-8379-2882641A221A}.Release|Any CPU.Build.0 = Release|Any CPU - {DBD186A2-8160-4BF3-92D4-61BF262F0CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBD186A2-8160-4BF3-92D4-61BF262F0CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU {A087FDCB-A669-4364-A8BB-C990CC5AB743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A087FDCB-A669-4364-A8BB-C990CC5AB743}.Debug|Any CPU.Build.0 = Debug|Any CPU {A087FDCB-A669-4364-A8BB-C990CC5AB743}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Source/CSharpDemos.sln.vsspell b/Source/CSharpDemos.sln.vsspell new file mode 100644 index 0000000..bc2788d --- /dev/null +++ b/Source/CSharpDemos.sln.vsspell @@ -0,0 +1,14 @@ + + + + True + + True + True + True + Common.vsspell + True + + True + \ No newline at end of file diff --git a/Source/CSharpDemos/CalendarBrowser/AboutDlg.Designer.cs b/Source/CSharpDemos/CalendarBrowser/AboutDlg.Designer.cs index a24aaf1..5665694 100644 --- a/Source/CSharpDemos/CalendarBrowser/AboutDlg.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/AboutDlg.Designer.cs @@ -47,9 +47,9 @@ private void InitializeComponent() // // lnkHelp // - this.lnkHelp.Location = new System.Drawing.Point(168, 318); + this.lnkHelp.Location = new System.Drawing.Point(187, 334); this.lnkHelp.Name = "lnkHelp"; - this.lnkHelp.Size = new System.Drawing.Size(144, 18); + this.lnkHelp.Size = new System.Drawing.Size(216, 23); this.lnkHelp.TabIndex = 6; this.lnkHelp.TabStop = true; this.lnkHelp.Text = "Eric@EWoodruff.us"; @@ -58,13 +58,13 @@ private void InitializeComponent() // ColumnHeader1 // this.ColumnHeader1.Text = "Name"; - this.ColumnHeader1.Width = 250; + this.ColumnHeader1.Width = 275; // // btnSysInfo // - this.btnSysInfo.Location = new System.Drawing.Point(334, 366); + this.btnSysInfo.Location = new System.Drawing.Point(355, 398); this.btnSysInfo.Name = "btnSysInfo"; - this.btnSysInfo.Size = new System.Drawing.Size(112, 32); + this.btnSysInfo.Size = new System.Drawing.Size(150, 32); this.btnSysInfo.TabIndex = 9; this.btnSysInfo.Text = "System Info..."; this.btnSysInfo.Click += new System.EventHandler(this.btnSysInfo_Click); @@ -72,9 +72,9 @@ private void InitializeComponent() // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(216, 366); + this.btnOK.Location = new System.Drawing.Point(199, 398); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(112, 32); + this.btnOK.Size = new System.Drawing.Size(150, 32); this.btnOK.TabIndex = 8; this.btnOK.Text = "OK"; // @@ -86,10 +86,10 @@ private void InitializeComponent() this.lvComponents.FullRowSelect = true; this.lvComponents.GridLines = true; this.lvComponents.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.lvComponents.Location = new System.Drawing.Point(12, 145); + this.lvComponents.Location = new System.Drawing.Point(12, 153); this.lvComponents.MultiSelect = false; this.lvComponents.Name = "lvComponents"; - this.lvComponents.Size = new System.Drawing.Size(434, 170); + this.lvComponents.Size = new System.Drawing.Size(493, 170); this.lvComponents.TabIndex = 4; this.lvComponents.UseCompatibleStateImageBehavior = false; this.lvComponents.View = System.Windows.Forms.View.Details; @@ -101,9 +101,9 @@ private void InitializeComponent() // // Label1 // - this.Label1.Location = new System.Drawing.Point(12, 123); + this.Label1.Location = new System.Drawing.Point(8, 127); this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(164, 19); + this.Label1.Size = new System.Drawing.Size(164, 23); this.Label1.TabIndex = 3; this.Label1.Text = "Product Components"; // @@ -111,23 +111,23 @@ private void InitializeComponent() // this.lblName.Location = new System.Drawing.Point(80, 8); this.lblName.Name = "lblName"; - this.lblName.Size = new System.Drawing.Size(366, 19); + this.lblName.Size = new System.Drawing.Size(425, 23); this.lblName.TabIndex = 0; this.lblName.Text = ""; // // lblDescription // - this.lblDescription.Location = new System.Drawing.Point(80, 56); + this.lblDescription.Location = new System.Drawing.Point(80, 64); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(366, 67); + this.lblDescription.Size = new System.Drawing.Size(425, 67); this.lblDescription.TabIndex = 2; this.lblDescription.Text = ""; // // lblCopyright // - this.lblCopyright.Location = new System.Drawing.Point(12, 344); + this.lblCopyright.Location = new System.Drawing.Point(12, 364); this.lblCopyright.Name = "lblCopyright"; - this.lblCopyright.Size = new System.Drawing.Size(434, 19); + this.lblCopyright.Size = new System.Drawing.Size(493, 23); this.lblCopyright.TabIndex = 7; this.lblCopyright.Text = ""; // @@ -143,17 +143,17 @@ private void InitializeComponent() // // lblVersion // - this.lblVersion.Location = new System.Drawing.Point(80, 32); + this.lblVersion.Location = new System.Drawing.Point(80, 36); this.lblVersion.Name = "lblVersion"; - this.lblVersion.Size = new System.Drawing.Size(366, 19); + this.lblVersion.Size = new System.Drawing.Size(425, 23); this.lblVersion.TabIndex = 1; this.lblVersion.Text = ""; // // label2 // - this.label2.Location = new System.Drawing.Point(12, 318); + this.label2.Location = new System.Drawing.Point(12, 334); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(162, 19); + this.label2.Size = new System.Drawing.Size(178, 23); this.label2.TabIndex = 5; this.label2.Text = "For help send e-mail to"; // @@ -161,7 +161,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnOK; this.CancelButton = this.btnOK; - this.ClientSize = new System.Drawing.Size(458, 410); + this.ClientSize = new System.Drawing.Size(517, 442); this.Controls.Add(this.lnkHelp); this.Controls.Add(this.label2); this.Controls.Add(this.btnSysInfo); diff --git a/Source/CSharpDemos/CalendarBrowser/AboutDlg.cs b/Source/CSharpDemos/CalendarBrowser/AboutDlg.cs index f8274ae..dcb4732 100644 --- a/Source/CSharpDemos/CalendarBrowser/AboutDlg.cs +++ b/Source/CSharpDemos/CalendarBrowser/AboutDlg.cs @@ -1,8 +1,8 @@ //=============================================================================================================== // File : AboutDlg.cs // Author : Eric Woodruff -// Updated : 12/27/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This form is used to display application version information @@ -17,6 +17,8 @@ // 11/10/2003 EFW Created the code //=============================================================================================================== +// Ignore Spelling: mailto + using System; using System.Reflection; using System.Windows.Forms; diff --git a/Source/CSharpDemos/CalendarBrowser/AlarmControl.Designer.cs b/Source/CSharpDemos/CalendarBrowser/AlarmControl.Designer.cs index 3f845bd..a321069 100644 --- a/Source/CSharpDemos/CalendarBrowser/AlarmControl.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/AlarmControl.Designer.cs @@ -63,10 +63,10 @@ private void InitializeComponent() this.tabInfo.Controls.Add(this.pgGeneral); this.tabInfo.Controls.Add(this.pgAttendees); this.tabInfo.Controls.Add(this.pgAttachments); - this.tabInfo.Location = new System.Drawing.Point(8, 8); + this.tabInfo.Location = new System.Drawing.Point(3, 3); this.tabInfo.Name = "tabInfo"; this.tabInfo.SelectedIndex = 0; - this.tabInfo.Size = new System.Drawing.Size(562, 272); + this.tabInfo.Size = new System.Drawing.Size(660, 308); this.tabInfo.TabIndex = 0; // // pgGeneral @@ -88,18 +88,18 @@ private void InitializeComponent() this.pgGeneral.Controls.Add(this.label4); this.pgGeneral.Controls.Add(this.cboAction); this.pgGeneral.Controls.Add(this.label10); - this.pgGeneral.Location = new System.Drawing.Point(4, 25); + this.pgGeneral.Location = new System.Drawing.Point(4, 29); this.pgGeneral.Name = "pgGeneral"; - this.pgGeneral.Size = new System.Drawing.Size(554, 243); + this.pgGeneral.Size = new System.Drawing.Size(652, 275); this.pgGeneral.TabIndex = 0; this.pgGeneral.Text = "General"; this.pgGeneral.UseVisualStyleBackColor = true; // // label3 // - this.label3.Location = new System.Drawing.Point(20, 72); + this.label3.Location = new System.Drawing.Point(20, 93); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(104, 23); + this.label3.Size = new System.Drawing.Size(127, 23); this.label3.TabIndex = 7; this.label3.Text = "or Date/Time"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -107,49 +107,49 @@ private void InitializeComponent() // txtDescription // this.txtDescription.AcceptsReturn = true; - this.txtDescription.Location = new System.Drawing.Point(130, 168); + this.txtDescription.Location = new System.Drawing.Point(153, 195); this.txtDescription.Multiline = true; this.txtDescription.Name = "txtDescription"; this.txtDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtDescription.Size = new System.Drawing.Size(384, 64); + this.txtDescription.Size = new System.Drawing.Size(457, 64); this.txtDescription.TabIndex = 16; // // label11 // - this.label11.Location = new System.Drawing.Point(25, 168); + this.label11.Location = new System.Drawing.Point(25, 197); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(99, 23); + this.label11.Size = new System.Drawing.Size(122, 23); this.label11.TabIndex = 15; this.label11.Text = "Description"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtSummary // - this.txtSummary.Location = new System.Drawing.Point(130, 136); + this.txtSummary.Location = new System.Drawing.Point(153, 161); this.txtSummary.Name = "txtSummary"; - this.txtSummary.Size = new System.Drawing.Size(384, 22); + this.txtSummary.Size = new System.Drawing.Size(457, 26); this.txtSummary.TabIndex = 14; // // label8 // - this.label8.Location = new System.Drawing.Point(38, 136); + this.label8.Location = new System.Drawing.Point(29, 163); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(86, 23); + this.label8.Size = new System.Drawing.Size(118, 23); this.label8.TabIndex = 13; this.label8.Text = "Summary"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtDuration // - this.txtDuration.Location = new System.Drawing.Point(284, 103); + this.txtDuration.Location = new System.Drawing.Point(345, 126); this.txtDuration.Name = "txtDuration"; - this.txtDuration.Size = new System.Drawing.Size(108, 22); + this.txtDuration.Size = new System.Drawing.Size(192, 26); this.txtDuration.TabIndex = 12; this.txtDuration.Validating += new System.ComponentModel.CancelEventHandler(this.Duration_Validating); // // label2 // - this.label2.Location = new System.Drawing.Point(202, 103); + this.label2.Location = new System.Drawing.Point(263, 128); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(76, 23); this.label2.TabIndex = 11; @@ -158,39 +158,39 @@ private void InitializeComponent() // // label15 // - this.label15.Location = new System.Drawing.Point(47, 103); + this.label15.Location = new System.Drawing.Point(33, 128); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(77, 23); + this.label15.Size = new System.Drawing.Size(114, 23); this.label15.TabIndex = 9; this.label15.Text = "Repeat"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // udcRepeat // - this.udcRepeat.Location = new System.Drawing.Point(130, 104); + this.udcRepeat.Location = new System.Drawing.Point(153, 127); this.udcRepeat.Maximum = new decimal(new int[] { 32767, 0, 0, 0}); this.udcRepeat.Name = "udcRepeat"; - this.udcRepeat.Size = new System.Drawing.Size(64, 22); + this.udcRepeat.Size = new System.Drawing.Size(85, 26); this.udcRepeat.TabIndex = 10; this.udcRepeat.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // chkFromEnd // - this.chkFromEnd.Location = new System.Drawing.Point(253, 40); + this.chkFromEnd.Location = new System.Drawing.Point(289, 61); this.chkFromEnd.Name = "chkFromEnd"; - this.chkFromEnd.Size = new System.Drawing.Size(280, 24); + this.chkFromEnd.Size = new System.Drawing.Size(350, 24); this.chkFromEnd.TabIndex = 6; this.chkFromEnd.Text = "Duration Trigger is relative to end time"; // // txtTrigger // - this.txtTrigger.Location = new System.Drawing.Point(130, 40); + this.txtTrigger.Location = new System.Drawing.Point(153, 59); this.txtTrigger.Name = "txtTrigger"; - this.txtTrigger.Size = new System.Drawing.Size(108, 22); + this.txtTrigger.Size = new System.Drawing.Size(108, 26); this.txtTrigger.TabIndex = 5; this.txtTrigger.Validating += new System.ComponentModel.CancelEventHandler(this.Duration_Validating); // @@ -199,17 +199,17 @@ private void InitializeComponent() this.dtpTrigger.Checked = false; this.dtpTrigger.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpTrigger.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpTrigger.Location = new System.Drawing.Point(130, 72); + this.dtpTrigger.Location = new System.Drawing.Point(153, 93); this.dtpTrigger.Name = "dtpTrigger"; this.dtpTrigger.ShowCheckBox = true; - this.dtpTrigger.Size = new System.Drawing.Size(210, 22); + this.dtpTrigger.Size = new System.Drawing.Size(255, 26); this.dtpTrigger.TabIndex = 8; // // label1 // - this.label1.Location = new System.Drawing.Point(5, 40); + this.label1.Location = new System.Drawing.Point(3, 61); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(119, 23); + this.label1.Size = new System.Drawing.Size(144, 23); this.label1.TabIndex = 4; this.label1.Text = "Duration Trigger"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -217,16 +217,16 @@ private void InitializeComponent() // txtOtherAction // this.txtOtherAction.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.txtOtherAction.Location = new System.Drawing.Point(346, 8); + this.txtOtherAction.Location = new System.Drawing.Point(411, 23); this.txtOtherAction.Name = "txtOtherAction"; - this.txtOtherAction.Size = new System.Drawing.Size(136, 22); + this.txtOtherAction.Size = new System.Drawing.Size(192, 26); this.txtOtherAction.TabIndex = 3; // // label4 // - this.label4.Location = new System.Drawing.Point(250, 8); + this.label4.Location = new System.Drawing.Point(285, 25); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(90, 23); + this.label4.Size = new System.Drawing.Size(120, 23); this.label4.TabIndex = 2; this.label4.Text = "Other Action"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -240,17 +240,17 @@ private void InitializeComponent() "E-Mail", "Procedure", "Other"}); - this.cboAction.Location = new System.Drawing.Point(130, 8); + this.cboAction.Location = new System.Drawing.Point(153, 23); this.cboAction.Name = "cboAction"; - this.cboAction.Size = new System.Drawing.Size(112, 24); + this.cboAction.Size = new System.Drawing.Size(112, 28); this.cboAction.TabIndex = 1; this.cboAction.SelectedIndexChanged += new System.EventHandler(this.cboAction_SelectedIndexChanged); // // label10 // - this.label10.Location = new System.Drawing.Point(63, 8); + this.label10.Location = new System.Drawing.Point(33, 25); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(61, 23); + this.label10.Size = new System.Drawing.Size(114, 23); this.label10.TabIndex = 0; this.label10.Text = "Action"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -258,42 +258,43 @@ private void InitializeComponent() // pgAttendees // this.pgAttendees.Controls.Add(this.ucAttendees); - this.pgAttendees.Location = new System.Drawing.Point(4, 25); + this.pgAttendees.Location = new System.Drawing.Point(4, 29); this.pgAttendees.Name = "pgAttendees"; - this.pgAttendees.Size = new System.Drawing.Size(554, 243); + this.pgAttendees.Size = new System.Drawing.Size(647, 270); this.pgAttendees.TabIndex = 1; this.pgAttendees.Text = "Attendees"; this.pgAttendees.UseVisualStyleBackColor = true; // // ucAttendees // - this.ucAttendees.Location = new System.Drawing.Point(22, 17); + this.ucAttendees.Location = new System.Drawing.Point(26, 18); this.ucAttendees.Name = "ucAttendees"; - this.ucAttendees.Size = new System.Drawing.Size(510, 208); + this.ucAttendees.Size = new System.Drawing.Size(594, 234); this.ucAttendees.TabIndex = 0; // // pgAttachments // this.pgAttachments.Controls.Add(this.ucAttachments); - this.pgAttachments.Location = new System.Drawing.Point(4, 25); + this.pgAttachments.Location = new System.Drawing.Point(4, 29); this.pgAttachments.Name = "pgAttachments"; - this.pgAttachments.Size = new System.Drawing.Size(554, 243); + this.pgAttachments.Size = new System.Drawing.Size(647, 270); this.pgAttachments.TabIndex = 2; this.pgAttachments.Text = "Attachments"; this.pgAttachments.UseVisualStyleBackColor = true; // // ucAttachments // - this.ucAttachments.Location = new System.Drawing.Point(6, 8); + this.ucAttachments.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucAttachments.Location = new System.Drawing.Point(0, 0); this.ucAttachments.Name = "ucAttachments"; - this.ucAttachments.Size = new System.Drawing.Size(543, 226); + this.ucAttachments.Size = new System.Drawing.Size(647, 270); this.ucAttachments.TabIndex = 0; // // AlarmControl // this.Controls.Add(this.tabInfo); this.Name = "AlarmControl"; - this.Size = new System.Drawing.Size(584, 312); + this.Size = new System.Drawing.Size(666, 342); this.Leave += new System.EventHandler(this.AlarmControl_Leave); this.Controls.SetChildIndex(this.tabInfo, 0); this.tabInfo.ResumeLayout(false); diff --git a/Source/CSharpDemos/CalendarBrowser/AlarmControl.cs b/Source/CSharpDemos/CalendarBrowser/AlarmControl.cs index 334b7e6..28da11f 100644 --- a/Source/CSharpDemos/CalendarBrowser/AlarmControl.cs +++ b/Source/CSharpDemos/CalendarBrowser/AlarmControl.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : AlarmControl.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit a calendar object's alarm collection properties @@ -349,11 +349,10 @@ private void cboAction_SelectedIndexChanged(object sender, EventArgs e) private void Duration_Validating(object sender, CancelEventArgs e) { TextBox t = (TextBox)sender; - Duration d; t.Text = t.Text.Trim(); - if(t.Text.Length != 0 && !Duration.TryParse(t.Text, out d)) + if(t.Text.Length != 0 && !Duration.TryParse(t.Text, out Duration d)) { this.ErrorProvider.SetError(t, "Invalid duration value"); e.Cancel = true; diff --git a/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.Designer.cs b/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.Designer.cs index e1e5464..ea51432 100644 --- a/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.Designer.cs @@ -43,33 +43,33 @@ private void InitializeComponent() // // chkInline // - this.chkInline.Location = new System.Drawing.Point(391, 8); + this.chkInline.Location = new System.Drawing.Point(442, 10); this.chkInline.Name = "chkInline"; - this.chkInline.Size = new System.Drawing.Size(130, 24); + this.chkInline.Size = new System.Drawing.Size(160, 24); this.chkInline.TabIndex = 3; this.chkInline.Text = "Store file inline"; // // btnLoad // - this.btnLoad.Location = new System.Drawing.Point(354, 7); + this.btnLoad.Location = new System.Drawing.Point(385, 7); this.btnLoad.Name = "btnLoad"; - this.btnLoad.Size = new System.Drawing.Size(28, 23); + this.btnLoad.Size = new System.Drawing.Size(35, 28); this.btnLoad.TabIndex = 2; this.btnLoad.Text = "..."; this.btnLoad.Click += new System.EventHandler(this.btnLoad_Click); // // txtFilename // - this.txtFilename.Location = new System.Drawing.Point(74, 8); + this.txtFilename.Location = new System.Drawing.Point(101, 8); this.txtFilename.Name = "txtFilename"; - this.txtFilename.Size = new System.Drawing.Size(280, 22); + this.txtFilename.Size = new System.Drawing.Size(280, 26); this.txtFilename.TabIndex = 1; // // label1 // - this.label1.Location = new System.Drawing.Point(10, 8); + this.label1.Location = new System.Drawing.Point(19, 10); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(58, 23); + this.label1.Size = new System.Drawing.Size(76, 23); this.label1.TabIndex = 0; this.label1.Text = "Name"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -78,9 +78,9 @@ private void InitializeComponent() // this.btnDetach.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnDetach.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnDetach.Location = new System.Drawing.Point(251, 170); + this.btnDetach.Location = new System.Drawing.Point(285, 260); this.btnDetach.Name = "btnDetach"; - this.btnDetach.Size = new System.Drawing.Size(75, 28); + this.btnDetach.Size = new System.Drawing.Size(88, 32); this.btnDetach.TabIndex = 10; this.btnDetach.Text = "Detach"; this.btnDetach.Click += new System.EventHandler(this.btnDetach_Click); @@ -89,9 +89,9 @@ private void InitializeComponent() // this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnClear.Location = new System.Drawing.Point(170, 170); + this.btnClear.Location = new System.Drawing.Point(191, 260); this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(75, 28); + this.btnClear.Size = new System.Drawing.Size(88, 32); this.btnClear.TabIndex = 9; this.btnClear.Text = "Clear"; this.btnClear.Click += new System.EventHandler(this.btnClear_Click); @@ -100,9 +100,9 @@ private void InitializeComponent() // this.btnRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnRemove.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnRemove.Location = new System.Drawing.Point(89, 170); + this.btnRemove.Location = new System.Drawing.Point(97, 260); this.btnRemove.Name = "btnRemove"; - this.btnRemove.Size = new System.Drawing.Size(75, 28); + this.btnRemove.Size = new System.Drawing.Size(88, 32); this.btnRemove.TabIndex = 8; this.btnRemove.Text = "Remove"; this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click); @@ -111,9 +111,9 @@ private void InitializeComponent() // this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnAdd.Location = new System.Drawing.Point(8, 170); + this.btnAdd.Location = new System.Drawing.Point(3, 260); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(75, 28); + this.btnAdd.Size = new System.Drawing.Size(88, 32); this.btnAdd.TabIndex = 7; this.btnAdd.Text = "Add"; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); @@ -125,25 +125,26 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.lbAttachments.HorizontalExtent = 800; this.lbAttachments.HorizontalScrollbar = true; - this.lbAttachments.ItemHeight = 16; - this.lbAttachments.Location = new System.Drawing.Point(8, 64); + this.lbAttachments.IntegralHeight = false; + this.lbAttachments.ItemHeight = 20; + this.lbAttachments.Location = new System.Drawing.Point(3, 72); this.lbAttachments.Name = "lbAttachments"; - this.lbAttachments.Size = new System.Drawing.Size(522, 100); + this.lbAttachments.Size = new System.Drawing.Size(623, 182); this.lbAttachments.TabIndex = 6; this.lbAttachments.SelectedIndexChanged += new System.EventHandler(this.lbAttachments_SelectedIndexChanged); // // txtFormat // - this.txtFormat.Location = new System.Drawing.Point(74, 36); + this.txtFormat.Location = new System.Drawing.Point(101, 40); this.txtFormat.Name = "txtFormat"; - this.txtFormat.Size = new System.Drawing.Size(280, 22); + this.txtFormat.Size = new System.Drawing.Size(280, 26); this.txtFormat.TabIndex = 5; // // label2 // - this.label2.Location = new System.Drawing.Point(10, 36); + this.label2.Location = new System.Drawing.Point(8, 42); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(58, 23); + this.label2.Size = new System.Drawing.Size(87, 23); this.label2.TabIndex = 4; this.label2.Text = "Format"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -162,7 +163,7 @@ private void InitializeComponent() this.Controls.Add(this.txtFilename); this.Controls.Add(this.label1); this.Name = "AttachmentsControl"; - this.Size = new System.Drawing.Size(538, 202); + this.Size = new System.Drawing.Size(629, 295); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.cs b/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.cs index a42a3c2..6674a8a 100644 --- a/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.cs +++ b/Source/CSharpDemos/CalendarBrowser/AttachmentsControl.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : AttachmentsControl.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit a calendar object's attachment properties @@ -167,9 +167,10 @@ private void btnAdd_Click(object sender, EventArgs e) { this.Cursor = Cursors.WaitCursor; - AttachProperty a = new AttachProperty(); - - a.FormatType = (txtFormat.Text.Trim().Length == 0) ? null : txtFormat.Text; + AttachProperty a = new AttachProperty + { + FormatType = (txtFormat.Text.Trim().Length == 0) ? null : txtFormat.Text + }; // If not inline, store the filename. If inline, store the data from the file. if(!chkInline.Checked) diff --git a/Source/CSharpDemos/CalendarBrowser/AttendeeControl.Designer.cs b/Source/CSharpDemos/CalendarBrowser/AttendeeControl.Designer.cs index f7062b9..f3eefc6 100644 --- a/Source/CSharpDemos/CalendarBrowser/AttendeeControl.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/AttendeeControl.Designer.cs @@ -63,47 +63,47 @@ private void InitializeComponent() this.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlControls.Location = new System.Drawing.Point(0, 0); this.pnlControls.Name = "pnlControls"; - this.pnlControls.Size = new System.Drawing.Size(496, 173); + this.pnlControls.Size = new System.Drawing.Size(571, 190); this.pnlControls.TabIndex = 0; // // txtSentBy // - this.txtSentBy.Location = new System.Drawing.Point(128, 107); + this.txtSentBy.Location = new System.Drawing.Point(153, 109); this.txtSentBy.Name = "txtSentBy"; - this.txtSentBy.Size = new System.Drawing.Size(248, 22); + this.txtSentBy.Size = new System.Drawing.Size(383, 26); this.txtSentBy.TabIndex = 9; // // label6 // - this.label6.Location = new System.Drawing.Point(58, 107); + this.label6.Location = new System.Drawing.Point(62, 111); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(64, 23); + this.label6.Size = new System.Drawing.Size(85, 23); this.label6.TabIndex = 8; this.label6.Text = "Sent By"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtAttendee // - this.txtAttendee.Location = new System.Drawing.Point(128, 11); + this.txtAttendee.Location = new System.Drawing.Point(153, 11); this.txtAttendee.Name = "txtAttendee"; - this.txtAttendee.Size = new System.Drawing.Size(248, 22); + this.txtAttendee.Size = new System.Drawing.Size(383, 26); this.txtAttendee.TabIndex = 1; this.txtAttendee.Validating += new System.ComponentModel.CancelEventHandler(this.txtAttendee_Validating); // // label4 // - this.label4.Location = new System.Drawing.Point(50, 11); + this.label4.Location = new System.Drawing.Point(62, 13); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(72, 23); + this.label4.Size = new System.Drawing.Size(85, 23); this.label4.TabIndex = 0; this.label4.Text = "Attendee"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // chkRSVP // - this.chkRSVP.Location = new System.Drawing.Point(328, 139); + this.chkRSVP.Location = new System.Drawing.Point(353, 143); this.chkRSVP.Name = "chkRSVP"; - this.chkRSVP.Size = new System.Drawing.Size(72, 24); + this.chkRSVP.Size = new System.Drawing.Size(118, 24); this.chkRSVP.TabIndex = 12; this.chkRSVP.Text = "RSVP"; // @@ -116,17 +116,17 @@ private void InitializeComponent() "REQ-PARTICIPANT", "OPT-PARTICIPANT", "NON-PARTICIPANT"}); - this.cboRole.Location = new System.Drawing.Point(328, 75); + this.cboRole.Location = new System.Drawing.Point(353, 75); this.cboRole.MaxDropDownItems = 16; this.cboRole.Name = "cboRole"; - this.cboRole.Size = new System.Drawing.Size(160, 24); + this.cboRole.Size = new System.Drawing.Size(183, 28); this.cboRole.TabIndex = 7; // // label3 // - this.label3.Location = new System.Drawing.Point(276, 75); + this.label3.Location = new System.Drawing.Point(287, 77); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(46, 23); + this.label3.Size = new System.Drawing.Size(60, 23); this.label3.TabIndex = 6; this.label3.Text = "Role"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -143,33 +143,33 @@ private void InitializeComponent() "DELEGATED", "COMPLETED", "IN-PROCESS"}); - this.cboStatus.Location = new System.Drawing.Point(128, 139); + this.cboStatus.Location = new System.Drawing.Point(153, 141); this.cboStatus.MaxDropDownItems = 16; this.cboStatus.Name = "cboStatus"; - this.cboStatus.Size = new System.Drawing.Size(176, 24); + this.cboStatus.Size = new System.Drawing.Size(176, 28); this.cboStatus.TabIndex = 11; // // label10 // - this.label10.Location = new System.Drawing.Point(63, 139); + this.label10.Location = new System.Drawing.Point(58, 143); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(59, 23); + this.label10.Size = new System.Drawing.Size(89, 23); this.label10.TabIndex = 10; this.label10.Text = "Status"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtCommonName // - this.txtCommonName.Location = new System.Drawing.Point(128, 43); + this.txtCommonName.Location = new System.Drawing.Point(153, 43); this.txtCommonName.Name = "txtCommonName"; - this.txtCommonName.Size = new System.Drawing.Size(248, 22); + this.txtCommonName.Size = new System.Drawing.Size(383, 26); this.txtCommonName.TabIndex = 3; // // label1 // - this.label1.Location = new System.Drawing.Point(8, 43); + this.label1.Location = new System.Drawing.Point(6, 45); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(114, 23); + this.label1.Size = new System.Drawing.Size(141, 23); this.label1.TabIndex = 2; this.label1.Text = "Common Name"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -177,16 +177,16 @@ private void InitializeComponent() // txtUserType // this.txtUserType.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.txtUserType.Location = new System.Drawing.Point(128, 75); + this.txtUserType.Location = new System.Drawing.Point(153, 75); this.txtUserType.Name = "txtUserType"; - this.txtUserType.Size = new System.Drawing.Size(128, 22); + this.txtUserType.Size = new System.Drawing.Size(128, 26); this.txtUserType.TabIndex = 5; // // label5 // - this.label5.Location = new System.Drawing.Point(36, 75); + this.label5.Location = new System.Drawing.Point(37, 77); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(86, 23); + this.label5.Size = new System.Drawing.Size(110, 23); this.label5.TabIndex = 4; this.label5.Text = "User Type"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -195,7 +195,7 @@ private void InitializeComponent() // this.Controls.Add(this.pnlControls); this.Name = "AttendeeControl"; - this.Size = new System.Drawing.Size(496, 200); + this.Size = new System.Drawing.Size(571, 218); this.Controls.SetChildIndex(this.pnlControls, 0); this.pnlControls.ResumeLayout(false); this.pnlControls.PerformLayout(); diff --git a/Source/CSharpDemos/CalendarBrowser/AttendeeControl.cs b/Source/CSharpDemos/CalendarBrowser/AttendeeControl.cs index c9510a3..09406a1 100644 --- a/Source/CSharpDemos/CalendarBrowser/AttendeeControl.cs +++ b/Source/CSharpDemos/CalendarBrowser/AttendeeControl.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : AttendeeControl.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit a calendar object's attendee collection @@ -19,6 +19,8 @@ // 04/18/2007 EFW Converted for use with .NET 2.0 //=============================================================================================================== +// Ignore Spelling: Rsvp + using System.ComponentModel; using System.Windows.Forms; diff --git a/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.Designer.cs b/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.Designer.cs index 89b6edd..e579404 100644 --- a/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.Designer.cs @@ -64,11 +64,11 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.btnChgTimeZone = new System.Windows.Forms.Button(); this.dgvCalendar = new System.Windows.Forms.DataGridView(); + this.lblFilename = new System.Windows.Forms.Label(); this.tbcStartDateTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tbcSummary = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tbcOrganizer = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tbcComment = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.lblFilename = new System.Windows.Forms.Label(); this.mnuMain.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvCalendar)).BeginInit(); this.SuspendLayout(); @@ -111,7 +111,7 @@ private void InitializeComponent() this.miFile}); this.mnuMain.Location = new System.Drawing.Point(0, 0); this.mnuMain.Name = "mnuMain"; - this.mnuMain.Size = new System.Drawing.Size(942, 25); + this.mnuMain.Size = new System.Drawing.Size(942, 28); this.mnuMain.TabIndex = 0; // // miFile @@ -128,14 +128,14 @@ private void InitializeComponent() this.miAbout, this.miExit}); this.miFile.Name = "miFile"; - this.miFile.Size = new System.Drawing.Size(42, 21); + this.miFile.Size = new System.Drawing.Size(46, 24); this.miFile.Text = "&File"; // // miOpen // this.miOpen.Name = "miOpen"; this.miOpen.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.miOpen.Size = new System.Drawing.Size(229, 22); + this.miOpen.Size = new System.Drawing.Size(263, 30); this.miOpen.Text = "&Open"; this.miOpen.Click += new System.EventHandler(this.miOpen_Click); // @@ -143,14 +143,14 @@ private void InitializeComponent() // this.miSave.Name = "miSave"; this.miSave.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.miSave.Size = new System.Drawing.Size(229, 22); + this.miSave.Size = new System.Drawing.Size(263, 30); this.miSave.Text = "&Save"; this.miSave.Click += new System.EventHandler(this.miSave_Click); // // menuItem2 // this.menuItem2.Name = "menuItem2"; - this.menuItem2.Size = new System.Drawing.Size(226, 6); + this.menuItem2.Size = new System.Drawing.Size(260, 6); // // miFileEncoding // @@ -159,7 +159,7 @@ private void InitializeComponent() this.miFileWestEuro, this.miFileASCII}); this.miFileEncoding.Name = "miFileEncoding"; - this.miFileEncoding.Size = new System.Drawing.Size(229, 22); + this.miFileEncoding.Size = new System.Drawing.Size(263, 30); this.miFileEncoding.Text = "File Encoding"; // // miFileUnicode @@ -167,21 +167,21 @@ private void InitializeComponent() this.miFileUnicode.Checked = true; this.miFileUnicode.CheckState = System.Windows.Forms.CheckState.Checked; this.miFileUnicode.Name = "miFileUnicode"; - this.miFileUnicode.Size = new System.Drawing.Size(265, 26); + this.miFileUnicode.Size = new System.Drawing.Size(302, 30); this.miFileUnicode.Text = "Unicode (UTF-8)"; this.miFileUnicode.Click += new System.EventHandler(this.ChangeFileEncoding_Click); // // miFileWestEuro // this.miFileWestEuro.Name = "miFileWestEuro"; - this.miFileWestEuro.Size = new System.Drawing.Size(265, 26); + this.miFileWestEuro.Size = new System.Drawing.Size(302, 30); this.miFileWestEuro.Text = "Western European (Windows)"; this.miFileWestEuro.Click += new System.EventHandler(this.ChangeFileEncoding_Click); // // miFileASCII // this.miFileASCII.Name = "miFileASCII"; - this.miFileASCII.Size = new System.Drawing.Size(265, 26); + this.miFileASCII.Size = new System.Drawing.Size(302, 30); this.miFileASCII.Text = "ASCII"; this.miFileASCII.Click += new System.EventHandler(this.ChangeFileEncoding_Click); // @@ -192,20 +192,20 @@ private void InitializeComponent() this.miPropWestEuro, this.miPropASCII}); this.miPropEncoding.Name = "miPropEncoding"; - this.miPropEncoding.Size = new System.Drawing.Size(229, 22); + this.miPropEncoding.Size = new System.Drawing.Size(263, 30); this.miPropEncoding.Text = "Property Encoding"; // // miPropUnicode // this.miPropUnicode.Name = "miPropUnicode"; - this.miPropUnicode.Size = new System.Drawing.Size(265, 26); + this.miPropUnicode.Size = new System.Drawing.Size(302, 30); this.miPropUnicode.Text = "Unicode (UTF-8)"; this.miPropUnicode.Click += new System.EventHandler(this.ChangePropEncoding_Click); // // miPropWestEuro // this.miPropWestEuro.Name = "miPropWestEuro"; - this.miPropWestEuro.Size = new System.Drawing.Size(265, 26); + this.miPropWestEuro.Size = new System.Drawing.Size(302, 30); this.miPropWestEuro.Text = "Western European (Windows)"; this.miPropWestEuro.Click += new System.EventHandler(this.ChangePropEncoding_Click); // @@ -214,45 +214,45 @@ private void InitializeComponent() this.miPropASCII.Checked = true; this.miPropASCII.CheckState = System.Windows.Forms.CheckState.Checked; this.miPropASCII.Name = "miPropASCII"; - this.miPropASCII.Size = new System.Drawing.Size(265, 26); + this.miPropASCII.Size = new System.Drawing.Size(302, 30); this.miPropASCII.Text = "ASCII"; this.miPropASCII.Click += new System.EventHandler(this.ChangePropEncoding_Click); // // menuItem4 // this.menuItem4.Name = "menuItem4"; - this.menuItem4.Size = new System.Drawing.Size(226, 6); + this.menuItem4.Size = new System.Drawing.Size(260, 6); // // miClear // this.miClear.Name = "miClear"; - this.miClear.Size = new System.Drawing.Size(229, 22); + this.miClear.Size = new System.Drawing.Size(263, 30); this.miClear.Text = "&Clear"; this.miClear.Click += new System.EventHandler(this.miClear_Click); // // menuItem6 // this.menuItem6.Name = "menuItem6"; - this.menuItem6.Size = new System.Drawing.Size(226, 6); + this.menuItem6.Size = new System.Drawing.Size(260, 6); // // miAbout // this.miAbout.Name = "miAbout"; - this.miAbout.Size = new System.Drawing.Size(229, 22); + this.miAbout.Size = new System.Drawing.Size(263, 30); this.miAbout.Text = "&About Calendar Browser"; this.miAbout.Click += new System.EventHandler(this.miAbout_Click); // // miExit // this.miExit.Name = "miExit"; - this.miExit.Size = new System.Drawing.Size(229, 22); + this.miExit.Size = new System.Drawing.Size(263, 30); this.miExit.Text = "E&xit"; this.miExit.Click += new System.EventHandler(this.miExit_Click); // // btnChgVersion // this.btnChgVersion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnChgVersion.Location = new System.Drawing.Point(480, 516); + this.btnChgVersion.Location = new System.Drawing.Point(448, 516); this.btnChgVersion.Name = "btnChgVersion"; this.btnChgVersion.Size = new System.Drawing.Size(88, 32); this.btnChgVersion.TabIndex = 6; @@ -263,18 +263,18 @@ private void InitializeComponent() // this.cboComponents.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cboComponents.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboComponents.Location = new System.Drawing.Point(786, 521); + this.cboComponents.Location = new System.Drawing.Point(754, 519); this.cboComponents.Name = "cboComponents"; - this.cboComponents.Size = new System.Drawing.Size(144, 24); + this.cboComponents.Size = new System.Drawing.Size(176, 28); this.cboComponents.TabIndex = 9; this.cboComponents.SelectedIndexChanged += new System.EventHandler(this.cboComponents_SelectedIndexChanged); // // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.label1.Location = new System.Drawing.Point(734, 521); + this.label1.Location = new System.Drawing.Point(679, 523); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(46, 23); + this.label1.Size = new System.Drawing.Size(69, 23); this.label1.TabIndex = 8; this.label1.Text = "V&iew"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -282,7 +282,7 @@ private void InitializeComponent() // btnChgTimeZone // this.btnChgTimeZone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnChgTimeZone.Location = new System.Drawing.Point(574, 516); + this.btnChgTimeZone.Location = new System.Drawing.Point(542, 516); this.btnChgTimeZone.Name = "btnChgTimeZone"; this.btnChgTimeZone.Size = new System.Drawing.Size(120, 32); this.btnChgTimeZone.TabIndex = 7; @@ -311,7 +311,7 @@ private void InitializeComponent() this.tbcSummary, this.tbcOrganizer, this.tbcComment}); - this.dgvCalendar.Location = new System.Drawing.Point(12, 51); + this.dgvCalendar.Location = new System.Drawing.Point(12, 54); this.dgvCalendar.MultiSelect = false; this.dgvCalendar.Name = "dgvCalendar"; this.dgvCalendar.ReadOnly = true; @@ -326,19 +326,32 @@ private void InitializeComponent() this.dgvCalendar.RowHeadersWidth = 25; this.dgvCalendar.RowTemplate.Height = 24; this.dgvCalendar.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCalendar.Size = new System.Drawing.Size(918, 459); + this.dgvCalendar.Size = new System.Drawing.Size(918, 456); this.dgvCalendar.StandardTab = true; this.dgvCalendar.TabIndex = 2; this.dgvCalendar.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCalendar_CellDoubleClick); this.dgvCalendar.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dgvCalendar_CellPainting); // + // lblFilename + // + this.lblFilename.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lblFilename.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.lblFilename.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblFilename.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.lblFilename.Location = new System.Drawing.Point(12, 28); + this.lblFilename.Name = "lblFilename"; + this.lblFilename.Size = new System.Drawing.Size(918, 23); + this.lblFilename.TabIndex = 1; + this.lblFilename.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // tbcStartDateTime // this.tbcStartDateTime.DataPropertyName = "StartDateTime"; this.tbcStartDateTime.HeaderText = "Start Date/Time"; this.tbcStartDateTime.Name = "tbcStartDateTime"; this.tbcStartDateTime.ReadOnly = true; - this.tbcStartDateTime.Width = 200; + this.tbcStartDateTime.Width = 210; // // tbcSummary // @@ -364,19 +377,6 @@ private void InitializeComponent() this.tbcComment.ReadOnly = true; this.tbcComment.Width = 500; // - // lblFilename - // - this.lblFilename.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblFilename.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.lblFilename.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblFilename.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblFilename.Location = new System.Drawing.Point(12, 25); - this.lblFilename.Name = "lblFilename"; - this.lblFilename.Size = new System.Drawing.Size(918, 23); - this.lblFilename.TabIndex = 1; - this.lblFilename.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // CalendarBrowserForm // this.ClientSize = new System.Drawing.Size(942, 560); diff --git a/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.cs b/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.cs index ca96ed7..75187f5 100644 --- a/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.cs +++ b/Source/CSharpDemos/CalendarBrowser/CalendarBrowserForm.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : CalendarBrowserForm.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is a simple demonstration application that shows how to load, save, and manage vCalendar and iCalendar @@ -75,10 +75,12 @@ public CalendarBrowserForm() InitializeComponent(); // The string format to use when drawing the status text - sf = new StringFormat(StringFormatFlags.NoWrap); - sf.Alignment = StringAlignment.Near; - sf.LineAlignment = StringAlignment.Center; - sf.Trimming = StringTrimming.EllipsisCharacter; + sf = new StringFormat(StringFormatFlags.NoWrap) + { + Alignment = StringAlignment.Near, + LineAlignment = StringAlignment.Center, + Trimming = StringTrimming.EllipsisCharacter + }; dgvCalendar.AutoGenerateColumns = false; @@ -779,7 +781,7 @@ private void ChangePropEncoding_Click(object sender, EventArgs e) /// utilizing a comparison delegate. This example sorts the collection by the start date/time property /// and, if they are equal, the summary description. This is used to handle all of the collection types. /// - private int CalendarSorter(CalendarObject x, CalendarObject y) + private static int CalendarSorter(CalendarObject x, CalendarObject y) { DateTime d1, d2; string summary1, summary2; @@ -948,7 +950,8 @@ private void dgvCalendar_CellPainting(object sender, DataGridViewCellPaintingEve /// The event arguments private void dgvCalendar_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - btnEdit_Click(sender, e); + if(e.RowIndex > -1) + btnEdit_Click(sender, e); } #endregion } diff --git a/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.Designer.cs b/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.Designer.cs index e31f973..d90f5cf 100644 --- a/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.Designer.cs @@ -116,7 +116,7 @@ private void InitializeComponent() // this.btnCancel.CausesValidation = false; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(542, 494); + this.btnCancel.Location = new System.Drawing.Point(653, 554); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(88, 32); this.btnCancel.TabIndex = 18; @@ -125,7 +125,7 @@ private void InitializeComponent() // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(12, 494); + this.btnOK.Location = new System.Drawing.Point(12, 554); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(88, 32); this.btnOK.TabIndex = 17; @@ -133,10 +133,10 @@ private void InitializeComponent() // // txtUniqueId // - this.txtUniqueId.Location = new System.Drawing.Point(112, 12); + this.txtUniqueId.Location = new System.Drawing.Point(140, 12); this.txtUniqueId.Name = "txtUniqueId"; this.txtUniqueId.ReadOnly = true; - this.txtUniqueId.Size = new System.Drawing.Size(376, 22); + this.txtUniqueId.Size = new System.Drawing.Size(376, 26); this.txtUniqueId.TabIndex = 1; this.txtUniqueId.TabStop = false; // @@ -149,10 +149,10 @@ private void InitializeComponent() this.tabInfo.Controls.Add(this.pgAttachments); this.tabInfo.Controls.Add(this.pgAlarms); this.tabInfo.Controls.Add(this.pgMisc); - this.tabInfo.Location = new System.Drawing.Point(12, 136); + this.tabInfo.Location = new System.Drawing.Point(12, 155); this.tabInfo.Name = "tabInfo"; this.tabInfo.SelectedIndex = 0; - this.tabInfo.Size = new System.Drawing.Size(618, 352); + this.tabInfo.Size = new System.Drawing.Size(733, 393); this.tabInfo.TabIndex = 16; // // pgGeneral @@ -179,23 +179,23 @@ private void InitializeComponent() this.pgGeneral.Controls.Add(this.dtpCompleted); this.pgGeneral.Controls.Add(this.lblPercent); this.pgGeneral.Controls.Add(this.udcPercent); - this.pgGeneral.Location = new System.Drawing.Point(4, 25); + this.pgGeneral.Location = new System.Drawing.Point(4, 29); this.pgGeneral.Name = "pgGeneral"; - this.pgGeneral.Size = new System.Drawing.Size(610, 323); + this.pgGeneral.Size = new System.Drawing.Size(725, 360); this.pgGeneral.TabIndex = 3; this.pgGeneral.Text = "General"; this.pgGeneral.UseVisualStyleBackColor = true; // // txtLocation // - this.txtLocation.Location = new System.Drawing.Point(112, 152); + this.txtLocation.Location = new System.Drawing.Point(117, 154); this.txtLocation.Name = "txtLocation"; - this.txtLocation.Size = new System.Drawing.Size(424, 22); + this.txtLocation.Size = new System.Drawing.Size(580, 26); this.txtLocation.TabIndex = 15; // // lblLocation // - this.lblLocation.Location = new System.Drawing.Point(29, 152); + this.lblLocation.Location = new System.Drawing.Point(34, 154); this.lblLocation.Name = "lblLocation"; this.lblLocation.Size = new System.Drawing.Size(77, 23); this.lblLocation.TabIndex = 14; @@ -205,32 +205,32 @@ private void InitializeComponent() // cboStatus // this.cboStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboStatus.Location = new System.Drawing.Point(112, 48); + this.cboStatus.Location = new System.Drawing.Point(117, 48); this.cboStatus.Name = "cboStatus"; - this.cboStatus.Size = new System.Drawing.Size(116, 24); + this.cboStatus.Size = new System.Drawing.Size(151, 28); this.cboStatus.TabIndex = 5; // // label18 // - this.label18.Location = new System.Drawing.Point(51, 48); + this.label18.Location = new System.Drawing.Point(28, 50); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(55, 23); + this.label18.Size = new System.Drawing.Size(83, 23); this.label18.TabIndex = 4; this.label18.Text = "Status"; this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtResources // - this.txtResources.Location = new System.Drawing.Point(112, 288); + this.txtResources.Location = new System.Drawing.Point(117, 318); this.txtResources.Name = "txtResources"; - this.txtResources.Size = new System.Drawing.Size(440, 22); + this.txtResources.Size = new System.Drawing.Size(580, 26); this.txtResources.TabIndex = 21; // // lblResources // - this.lblResources.Location = new System.Drawing.Point(19, 288); + this.lblResources.Location = new System.Drawing.Point(12, 318); this.lblResources.Name = "lblResources"; - this.lblResources.Size = new System.Drawing.Size(87, 23); + this.lblResources.Size = new System.Drawing.Size(99, 23); this.lblResources.TabIndex = 20; this.lblResources.Text = "Resources"; this.lblResources.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -238,32 +238,32 @@ private void InitializeComponent() // txtDescription // this.txtDescription.AcceptsReturn = true; - this.txtDescription.Location = new System.Drawing.Point(112, 184); + this.txtDescription.Location = new System.Drawing.Point(117, 186); this.txtDescription.Multiline = true; this.txtDescription.Name = "txtDescription"; this.txtDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtDescription.Size = new System.Drawing.Size(424, 56); + this.txtDescription.Size = new System.Drawing.Size(580, 82); this.txtDescription.TabIndex = 17; // // label11 // - this.label11.Location = new System.Drawing.Point(19, 184); + this.label11.Location = new System.Drawing.Point(8, 186); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(87, 23); + this.label11.Size = new System.Drawing.Size(103, 23); this.label11.TabIndex = 16; this.label11.Text = "Description"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtSummary // - this.txtSummary.Location = new System.Drawing.Point(112, 120); + this.txtSummary.Location = new System.Drawing.Point(117, 122); this.txtSummary.Name = "txtSummary"; - this.txtSummary.Size = new System.Drawing.Size(424, 22); + this.txtSummary.Size = new System.Drawing.Size(580, 26); this.txtSummary.TabIndex = 13; // // label8 // - this.label8.Location = new System.Drawing.Point(27, 120); + this.label8.Location = new System.Drawing.Point(32, 122); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(79, 23); this.label8.TabIndex = 12; @@ -272,34 +272,34 @@ private void InitializeComponent() // // txtCategories // - this.txtCategories.Location = new System.Drawing.Point(112, 256); + this.txtCategories.Location = new System.Drawing.Point(117, 286); this.txtCategories.Name = "txtCategories"; - this.txtCategories.Size = new System.Drawing.Size(440, 22); + this.txtCategories.Size = new System.Drawing.Size(580, 26); this.txtCategories.TabIndex = 19; // // label21 // - this.label21.Location = new System.Drawing.Point(19, 256); + this.label21.Location = new System.Drawing.Point(12, 286); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(87, 23); + this.label21.Size = new System.Drawing.Size(99, 23); this.label21.TabIndex = 18; this.label21.Text = "&Categories"; this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lblEndDate // - this.lblEndDate.Location = new System.Drawing.Point(338, 16); + this.lblEndDate.Location = new System.Drawing.Point(379, 16); this.lblEndDate.Name = "lblEndDate"; - this.lblEndDate.Size = new System.Drawing.Size(40, 23); + this.lblEndDate.Size = new System.Drawing.Size(57, 23); this.lblEndDate.TabIndex = 2; this.lblEndDate.Text = "End"; this.lblEndDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtDuration // - this.txtDuration.Location = new System.Drawing.Point(384, 48); + this.txtDuration.Location = new System.Drawing.Point(389, 48); this.txtDuration.Name = "txtDuration"; - this.txtDuration.Size = new System.Drawing.Size(80, 22); + this.txtDuration.Size = new System.Drawing.Size(116, 26); this.txtDuration.TabIndex = 7; // // dtpEndDate @@ -307,10 +307,10 @@ private void InitializeComponent() this.dtpEndDate.Checked = false; this.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEndDate.Location = new System.Drawing.Point(384, 16); + this.dtpEndDate.Location = new System.Drawing.Point(442, 16); this.dtpEndDate.Name = "dtpEndDate"; this.dtpEndDate.ShowCheckBox = true; - this.dtpEndDate.Size = new System.Drawing.Size(210, 22); + this.dtpEndDate.Size = new System.Drawing.Size(255, 26); this.dtpEndDate.TabIndex = 3; // // dtpStartDate @@ -318,35 +318,35 @@ private void InitializeComponent() this.dtpStartDate.Checked = false; this.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStartDate.Location = new System.Drawing.Point(112, 16); + this.dtpStartDate.Location = new System.Drawing.Point(117, 16); this.dtpStartDate.Name = "dtpStartDate"; this.dtpStartDate.ShowCheckBox = true; - this.dtpStartDate.Size = new System.Drawing.Size(210, 22); + this.dtpStartDate.Size = new System.Drawing.Size(255, 26); this.dtpStartDate.TabIndex = 1; // // lblDuration // - this.lblDuration.Location = new System.Drawing.Point(309, 48); + this.lblDuration.Location = new System.Drawing.Point(284, 50); this.lblDuration.Name = "lblDuration"; - this.lblDuration.Size = new System.Drawing.Size(69, 23); + this.lblDuration.Size = new System.Drawing.Size(99, 23); this.lblDuration.TabIndex = 6; this.lblDuration.Text = "Duration"; this.lblDuration.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label1 // - this.label1.Location = new System.Drawing.Point(61, 16); + this.label1.Location = new System.Drawing.Point(51, 16); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(45, 23); + this.label1.Size = new System.Drawing.Size(60, 23); this.label1.TabIndex = 0; this.label1.Text = "&Start"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lblCompleted // - this.lblCompleted.Location = new System.Drawing.Point(291, 79); + this.lblCompleted.Location = new System.Drawing.Point(267, 83); this.lblCompleted.Name = "lblCompleted"; - this.lblCompleted.Size = new System.Drawing.Size(87, 23); + this.lblCompleted.Size = new System.Drawing.Size(116, 23); this.lblCompleted.TabIndex = 10; this.lblCompleted.Text = "Completed"; this.lblCompleted.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -356,26 +356,26 @@ private void InitializeComponent() this.dtpCompleted.Checked = false; this.dtpCompleted.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpCompleted.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpCompleted.Location = new System.Drawing.Point(384, 79); + this.dtpCompleted.Location = new System.Drawing.Point(389, 81); this.dtpCompleted.Name = "dtpCompleted"; this.dtpCompleted.ShowCheckBox = true; - this.dtpCompleted.Size = new System.Drawing.Size(210, 22); + this.dtpCompleted.Size = new System.Drawing.Size(255, 26); this.dtpCompleted.TabIndex = 11; // // lblPercent // - this.lblPercent.Location = new System.Drawing.Point(42, 79); + this.lblPercent.Location = new System.Drawing.Point(18, 83); this.lblPercent.Name = "lblPercent"; - this.lblPercent.Size = new System.Drawing.Size(64, 23); + this.lblPercent.Size = new System.Drawing.Size(93, 23); this.lblPercent.TabIndex = 8; this.lblPercent.Text = "% Done"; this.lblPercent.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // udcPercent // - this.udcPercent.Location = new System.Drawing.Point(112, 80); + this.udcPercent.Location = new System.Drawing.Point(117, 82); this.udcPercent.Name = "udcPercent"; - this.udcPercent.Size = new System.Drawing.Size(56, 22); + this.udcPercent.Size = new System.Drawing.Size(65, 26); this.udcPercent.TabIndex = 9; this.udcPercent.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -385,9 +385,9 @@ private void InitializeComponent() this.pgAttendees.Controls.Add(this.txtOrganizer); this.pgAttendees.Controls.Add(this.label5); this.pgAttendees.Controls.Add(this.ucAttendees); - this.pgAttendees.Location = new System.Drawing.Point(4, 25); + this.pgAttendees.Location = new System.Drawing.Point(4, 29); this.pgAttendees.Name = "pgAttendees"; - this.pgAttendees.Size = new System.Drawing.Size(610, 323); + this.pgAttendees.Size = new System.Drawing.Size(725, 360); this.pgAttendees.TabIndex = 0; this.pgAttendees.Text = "Attendees"; this.pgAttendees.UseVisualStyleBackColor = true; @@ -395,58 +395,58 @@ private void InitializeComponent() // // groupBox1 // - this.groupBox1.Location = new System.Drawing.Point(36, 48); + this.groupBox1.Location = new System.Drawing.Point(66, 75); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(544, 8); + this.groupBox1.Size = new System.Drawing.Size(597, 8); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; // // txtOrganizer // - this.txtOrganizer.Location = new System.Drawing.Point(116, 16); + this.txtOrganizer.Location = new System.Drawing.Point(215, 34); this.txtOrganizer.Name = "txtOrganizer"; - this.txtOrganizer.Size = new System.Drawing.Size(448, 22); + this.txtOrganizer.Size = new System.Drawing.Size(448, 26); this.txtOrganizer.TabIndex = 1; // // label5 // - this.label5.Location = new System.Drawing.Point(23, 16); + this.label5.Location = new System.Drawing.Point(105, 36); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(87, 23); + this.label5.Size = new System.Drawing.Size(104, 23); this.label5.TabIndex = 0; this.label5.Text = "&Organizer"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // ucAttendees // - this.ucAttendees.Location = new System.Drawing.Point(57, 72); + this.ucAttendees.Location = new System.Drawing.Point(66, 100); this.ucAttendees.Name = "ucAttendees"; - this.ucAttendees.Size = new System.Drawing.Size(496, 216); + this.ucAttendees.Size = new System.Drawing.Size(597, 227); this.ucAttendees.TabIndex = 3; // // pgRecurrence // this.pgRecurrence.Controls.Add(this.ucRecurrences); - this.pgRecurrence.Location = new System.Drawing.Point(4, 25); + this.pgRecurrence.Location = new System.Drawing.Point(4, 29); this.pgRecurrence.Name = "pgRecurrence"; - this.pgRecurrence.Size = new System.Drawing.Size(610, 323); + this.pgRecurrence.Size = new System.Drawing.Size(725, 360); this.pgRecurrence.TabIndex = 4; this.pgRecurrence.Text = "Recurrence"; this.pgRecurrence.UseVisualStyleBackColor = true; // // ucRecurrences // - this.ucRecurrences.Location = new System.Drawing.Point(33, 21); + this.ucRecurrences.Location = new System.Drawing.Point(19, 17); this.ucRecurrences.Name = "ucRecurrences"; - this.ucRecurrences.Size = new System.Drawing.Size(545, 280); + this.ucRecurrences.Size = new System.Drawing.Size(686, 327); this.ucRecurrences.TabIndex = 0; // // pgExceptions // this.pgExceptions.Controls.Add(this.ucExceptions); - this.pgExceptions.Location = new System.Drawing.Point(4, 25); + this.pgExceptions.Location = new System.Drawing.Point(4, 29); this.pgExceptions.Name = "pgExceptions"; - this.pgExceptions.Size = new System.Drawing.Size(610, 323); + this.pgExceptions.Size = new System.Drawing.Size(725, 360); this.pgExceptions.TabIndex = 5; this.pgExceptions.Text = "Exceptions"; this.pgExceptions.UseVisualStyleBackColor = true; @@ -454,17 +454,17 @@ private void InitializeComponent() // ucExceptions // this.ucExceptions.EditsExceptions = true; - this.ucExceptions.Location = new System.Drawing.Point(33, 21); + this.ucExceptions.Location = new System.Drawing.Point(19, 17); this.ucExceptions.Name = "ucExceptions"; - this.ucExceptions.Size = new System.Drawing.Size(545, 280); + this.ucExceptions.Size = new System.Drawing.Size(686, 327); this.ucExceptions.TabIndex = 0; // // pgAttachments // this.pgAttachments.Controls.Add(this.ucAttachments); - this.pgAttachments.Location = new System.Drawing.Point(4, 25); + this.pgAttachments.Location = new System.Drawing.Point(4, 29); this.pgAttachments.Name = "pgAttachments"; - this.pgAttachments.Size = new System.Drawing.Size(610, 323); + this.pgAttachments.Size = new System.Drawing.Size(725, 360); this.pgAttachments.TabIndex = 1; this.pgAttachments.Text = "Attachments"; this.pgAttachments.UseVisualStyleBackColor = true; @@ -472,26 +472,26 @@ private void InitializeComponent() // // ucAttachments // - this.ucAttachments.Location = new System.Drawing.Point(17, 9); + this.ucAttachments.Location = new System.Drawing.Point(40, 17); this.ucAttachments.Name = "ucAttachments"; - this.ucAttachments.Size = new System.Drawing.Size(576, 304); + this.ucAttachments.Size = new System.Drawing.Size(649, 327); this.ucAttachments.TabIndex = 0; // // pgAlarms // this.pgAlarms.Controls.Add(this.ucAlarms); - this.pgAlarms.Location = new System.Drawing.Point(4, 25); + this.pgAlarms.Location = new System.Drawing.Point(4, 29); this.pgAlarms.Name = "pgAlarms"; - this.pgAlarms.Size = new System.Drawing.Size(610, 323); + this.pgAlarms.Size = new System.Drawing.Size(725, 360); this.pgAlarms.TabIndex = 7; this.pgAlarms.Text = "Alarms"; this.pgAlarms.UseVisualStyleBackColor = true; // // ucAlarms // - this.ucAlarms.Location = new System.Drawing.Point(15, 5); + this.ucAlarms.Location = new System.Drawing.Point(24, 7); this.ucAlarms.Name = "ucAlarms"; - this.ucAlarms.Size = new System.Drawing.Size(581, 312); + this.ucAlarms.Size = new System.Drawing.Size(677, 347); this.ucAlarms.TabIndex = 0; // // pgMisc @@ -508,16 +508,16 @@ private void InitializeComponent() this.pgMisc.Controls.Add(this.label17); this.pgMisc.Controls.Add(this.txtUrl); this.pgMisc.Controls.Add(this.label3); - this.pgMisc.Location = new System.Drawing.Point(4, 25); + this.pgMisc.Location = new System.Drawing.Point(4, 29); this.pgMisc.Name = "pgMisc"; - this.pgMisc.Size = new System.Drawing.Size(610, 323); + this.pgMisc.Size = new System.Drawing.Size(725, 360); this.pgMisc.TabIndex = 6; this.pgMisc.Text = "Misc"; this.pgMisc.UseVisualStyleBackColor = true; // // groupBox3 // - this.groupBox3.Location = new System.Drawing.Point(197, 0); + this.groupBox3.Location = new System.Drawing.Point(241, 0); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(2, 160); this.groupBox3.TabIndex = 5; @@ -527,54 +527,54 @@ private void InitializeComponent() // this.groupBox2.Location = new System.Drawing.Point(8, 162); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(600, 8); + this.groupBox2.Size = new System.Drawing.Size(700, 8); this.groupBox2.TabIndex = 7; this.groupBox2.TabStop = false; // // ucRequestStatus // - this.ucRequestStatus.Location = new System.Drawing.Point(203, 16); + this.ucRequestStatus.Location = new System.Drawing.Point(247, 16); this.ucRequestStatus.Name = "ucRequestStatus"; - this.ucRequestStatus.Size = new System.Drawing.Size(402, 144); + this.ucRequestStatus.Size = new System.Drawing.Size(471, 144); this.ucRequestStatus.TabIndex = 6; // // btnFind // - this.btnFind.Location = new System.Drawing.Point(88, 100); + this.btnFind.Location = new System.Drawing.Point(108, 100); this.btnFind.Name = "btnFind"; - this.btnFind.Size = new System.Drawing.Size(64, 28); + this.btnFind.Size = new System.Drawing.Size(88, 32); this.btnFind.TabIndex = 4; this.btnFind.Text = "&Find"; this.btnFind.Click += new System.EventHandler(this.btnFind_Click); // // txtLongitude // - this.txtLongitude.Location = new System.Drawing.Point(88, 72); + this.txtLongitude.Location = new System.Drawing.Point(108, 68); this.txtLongitude.Name = "txtLongitude"; - this.txtLongitude.Size = new System.Drawing.Size(88, 22); + this.txtLongitude.Size = new System.Drawing.Size(120, 26); this.txtLongitude.TabIndex = 3; // // lblLongitude // - this.lblLongitude.Location = new System.Drawing.Point(6, 72); + this.lblLongitude.Location = new System.Drawing.Point(6, 70); this.lblLongitude.Name = "lblLongitude"; - this.lblLongitude.Size = new System.Drawing.Size(76, 23); + this.lblLongitude.Size = new System.Drawing.Size(96, 23); this.lblLongitude.TabIndex = 2; this.lblLongitude.Text = "Longitude"; this.lblLongitude.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtLatitude // - this.txtLatitude.Location = new System.Drawing.Point(88, 40); + this.txtLatitude.Location = new System.Drawing.Point(108, 36); this.txtLatitude.Name = "txtLatitude"; - this.txtLatitude.Size = new System.Drawing.Size(88, 22); + this.txtLatitude.Size = new System.Drawing.Size(120, 26); this.txtLatitude.TabIndex = 1; // // lblLatitude // - this.lblLatitude.Location = new System.Drawing.Point(18, 40); + this.lblLatitude.Location = new System.Drawing.Point(6, 38); this.lblLatitude.Name = "lblLatitude"; - this.lblLatitude.Size = new System.Drawing.Size(64, 23); + this.lblLatitude.Size = new System.Drawing.Size(96, 23); this.lblLatitude.TabIndex = 0; this.lblLatitude.Text = "&Latitude"; this.lblLatitude.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -586,14 +586,14 @@ private void InitializeComponent() this.txtComments.Multiline = true; this.txtComments.Name = "txtComments"; this.txtComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtComments.Size = new System.Drawing.Size(424, 64); + this.txtComments.Size = new System.Drawing.Size(554, 127); this.txtComments.TabIndex = 11; // // label17 // - this.label17.Location = new System.Drawing.Point(54, 216); + this.label17.Location = new System.Drawing.Point(32, 218); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(80, 23); + this.label17.Size = new System.Drawing.Size(102, 23); this.label17.TabIndex = 10; this.label17.Text = "&Comments"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -602,23 +602,23 @@ private void InitializeComponent() // this.txtUrl.Location = new System.Drawing.Point(140, 184); this.txtUrl.Name = "txtUrl"; - this.txtUrl.Size = new System.Drawing.Size(424, 22); + this.txtUrl.Size = new System.Drawing.Size(554, 26); this.txtUrl.TabIndex = 9; // // label3 // - this.label3.Location = new System.Drawing.Point(94, 184); + this.label3.Location = new System.Drawing.Point(58, 186); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(40, 23); + this.label3.Size = new System.Drawing.Size(76, 23); this.label3.TabIndex = 8; this.label3.Text = "&URL"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label9 // - this.label9.Location = new System.Drawing.Point(26, 11); + this.label9.Location = new System.Drawing.Point(25, 14); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(80, 23); + this.label9.Size = new System.Drawing.Size(109, 23); this.label9.TabIndex = 0; this.label9.Text = "Unique ID"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -626,105 +626,105 @@ private void InitializeComponent() // txtClass // this.txtClass.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.txtClass.Location = new System.Drawing.Point(112, 98); + this.txtClass.Location = new System.Drawing.Point(140, 110); this.txtClass.Name = "txtClass"; - this.txtClass.Size = new System.Drawing.Size(144, 22); + this.txtClass.Size = new System.Drawing.Size(144, 26); this.txtClass.TabIndex = 11; // // label10 // - this.label10.Location = new System.Drawing.Point(58, 97); + this.label10.Location = new System.Drawing.Point(48, 112); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(48, 23); + this.label10.Size = new System.Drawing.Size(86, 23); this.label10.TabIndex = 10; this.label10.Text = "Class"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtLastModified // - this.txtLastModified.Location = new System.Drawing.Point(400, 40); + this.txtLastModified.Location = new System.Drawing.Point(496, 44); this.txtLastModified.Name = "txtLastModified"; this.txtLastModified.ReadOnly = true; - this.txtLastModified.Size = new System.Drawing.Size(168, 22); + this.txtLastModified.Size = new System.Drawing.Size(207, 26); this.txtLastModified.TabIndex = 6; this.txtLastModified.TabStop = false; // // label6 // - this.label6.Location = new System.Drawing.Point(298, 40); + this.label6.Location = new System.Drawing.Point(363, 46); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(96, 23); + this.label6.Size = new System.Drawing.Size(127, 23); this.label6.TabIndex = 5; this.label6.Text = "Last Modified"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtCreated // - this.txtCreated.Location = new System.Drawing.Point(112, 40); + this.txtCreated.Location = new System.Drawing.Point(140, 44); this.txtCreated.Name = "txtCreated"; this.txtCreated.ReadOnly = true; - this.txtCreated.Size = new System.Drawing.Size(168, 22); + this.txtCreated.Size = new System.Drawing.Size(207, 26); this.txtCreated.TabIndex = 4; this.txtCreated.TabStop = false; // // label7 // - this.label7.Location = new System.Drawing.Point(34, 40); + this.label7.Location = new System.Drawing.Point(44, 46); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(72, 23); + this.label7.Size = new System.Drawing.Size(90, 23); this.label7.TabIndex = 3; this.label7.Text = "Created"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // udcSequence // - this.udcSequence.Location = new System.Drawing.Point(352, 98); + this.udcSequence.Location = new System.Drawing.Point(401, 110); this.udcSequence.Maximum = new decimal(new int[] { 1048576, 0, 0, 0}); this.udcSequence.Name = "udcSequence"; - this.udcSequence.Size = new System.Drawing.Size(64, 22); + this.udcSequence.Size = new System.Drawing.Size(97, 26); this.udcSequence.TabIndex = 13; this.udcSequence.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // label15 // - this.label15.Location = new System.Drawing.Point(266, 98); + this.label15.Location = new System.Drawing.Point(291, 112); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(80, 23); + this.label15.Size = new System.Drawing.Size(104, 23); this.label15.TabIndex = 12; this.label15.Text = "Sequence"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lblPriority // - this.lblPriority.Location = new System.Drawing.Point(434, 97); + this.lblPriority.Location = new System.Drawing.Point(510, 112); this.lblPriority.Name = "lblPriority"; - this.lblPriority.Size = new System.Drawing.Size(56, 23); + this.lblPriority.Size = new System.Drawing.Size(77, 23); this.lblPriority.TabIndex = 14; this.lblPriority.Text = "Priority"; this.lblPriority.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // udcPriority // - this.udcPriority.Location = new System.Drawing.Point(496, 98); + this.udcPriority.Location = new System.Drawing.Point(593, 110); this.udcPriority.Maximum = new decimal(new int[] { 9, 0, 0, 0}); this.udcPriority.Name = "udcPriority"; - this.udcPriority.Size = new System.Drawing.Size(64, 22); + this.udcPriority.Size = new System.Drawing.Size(61, 26); this.udcPriority.TabIndex = 15; this.udcPriority.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // chkTransparent // - this.chkTransparent.Location = new System.Drawing.Point(511, 12); + this.chkTransparent.Location = new System.Drawing.Point(545, 14); this.chkTransparent.Name = "chkTransparent"; - this.chkTransparent.Size = new System.Drawing.Size(119, 24); + this.chkTransparent.Size = new System.Drawing.Size(154, 24); this.chkTransparent.TabIndex = 2; this.chkTransparent.Text = "Transparent"; // @@ -734,28 +734,26 @@ private void InitializeComponent() // // label2 // - this.label2.Location = new System.Drawing.Point(14, 68); + this.label2.Location = new System.Drawing.Point(18, 79); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(92, 23); + this.label2.Size = new System.Drawing.Size(116, 23); this.label2.TabIndex = 7; this.label2.Text = "&Time Zone"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // cboTimeZone // - this.cboTimeZone.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.cboTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboTimeZone.Location = new System.Drawing.Point(112, 68); + this.cboTimeZone.Location = new System.Drawing.Point(140, 76); this.cboTimeZone.MaxDropDownItems = 16; this.cboTimeZone.Name = "cboTimeZone"; - this.cboTimeZone.Size = new System.Drawing.Size(448, 24); + this.cboTimeZone.Size = new System.Drawing.Size(514, 28); this.cboTimeZone.TabIndex = 8; this.cboTimeZone.SelectedIndexChanged += new System.EventHandler(this.cboTimeZone_SelectedIndexChanged); // // btnApplyTZ // - this.btnApplyTZ.Location = new System.Drawing.Point(566, 65); + this.btnApplyTZ.Location = new System.Drawing.Point(660, 76); this.btnApplyTZ.Name = "btnApplyTZ"; this.btnApplyTZ.Size = new System.Drawing.Size(64, 28); this.btnApplyTZ.TabIndex = 9; @@ -766,7 +764,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnOK; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(642, 538); + this.ClientSize = new System.Drawing.Size(757, 598); this.Controls.Add(this.btnApplyTZ); this.Controls.Add(this.label2); this.Controls.Add(this.cboTimeZone); diff --git a/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.cs b/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.cs index 9b6cc58..4a9a5d3 100644 --- a/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.cs +++ b/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : CalendarObjectDlg.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit a calendar object's properties (VEvent, VToDo, or a VJournal component) @@ -83,9 +83,8 @@ public void SetValues(CalendarObject oCal) txtDuration.Enabled = txtOrganizer.Enabled = ucRequestStatus.Enabled = txtLatitude.Enabled = txtLongitude.Enabled = btnFind.Enabled = cboTimeZone.Enabled = btnApplyTZ.Enabled = isICalendar; - if(oCal is VEvent) + if(oCal is VEvent e) { - VEvent e = (VEvent)oCal; this.Text = "Event Properties"; lblCompleted.Visible = dtpCompleted.Visible = lblPercent.Visible = udcPercent.Visible = false; @@ -165,9 +164,8 @@ public void SetValues(CalendarObject oCal) txtUrl.Text = e.Url.Value; txtComments.Text = e.Comment.Value; } - else if(oCal is VToDo) + else if(oCal is VToDo td) { - VToDo td = (VToDo)oCal; this.Text = "To-Do Properties"; chkTransparent.Visible = lblLocation.Visible = txtLocation.Visible = false; @@ -258,9 +256,8 @@ public void SetValues(CalendarObject oCal) txtUrl.Text = td.Url.Value; txtComments.Text = td.Comment.Value; } - else if(oCal is VJournal) + else if(oCal is VJournal j) { - VJournal j = (VJournal)oCal; this.Text = "Journal Properties"; chkTransparent.Visible = lblPriority.Visible = udcPriority.Visible = lblEndDate.Visible = @@ -294,7 +291,7 @@ public void SetValues(CalendarObject oCal) txtDescription.Text = j.Description.Value; // Load status values and set status - cboStatus.Items.AddRange(new[] { "None", "Draft", "Final", "Cancelled" }); + cboStatus.Items.AddRange(new[] { "None", "Draft", "Final", "Cancelled" }); if(!cboStatus.Items.Contains(j.Status.StatusValue.ToString())) cboStatus.Items.Add(j.Status.StatusValue.ToString()); @@ -349,10 +346,8 @@ public void GetValues(CalendarObject oCal) { // We'll use the TimeZoneDateTime property on all date/time values so that they are set literally // rather than being converted to the time zone as would happen with the DateTimeValue property. - if(oCal is VEvent) + if(oCal is VEvent e) { - VEvent e = (VEvent)oCal; - // Header. Unique ID and Created Date are not changed e.Transparency.IsTransparent = chkTransparent.Checked; e.LastModified.TimeZoneDateTime = DateTime.Now; @@ -425,10 +420,8 @@ public void GetValues(CalendarObject oCal) e.Url.Value = txtUrl.Text; e.Comment.Value = txtComments.Text; } - else if(oCal is VToDo) + else if(oCal is VToDo td) { - VToDo td = (VToDo)oCal; - // Header. Unique ID and Created Date are not changed td.LastModified.TimeZoneDateTime = DateTime.Now; td.Classification.Value = txtClass.Text; @@ -508,10 +501,8 @@ public void GetValues(CalendarObject oCal) td.Url.Value = txtUrl.Text; td.Comment.Value = txtComments.Text; } - else if(oCal is VJournal) + else if(oCal is VJournal j) { - VJournal j = (VJournal)oCal; - // Header. Unique ID and Created Date are not changed j.LastModified.TimeZoneDateTime = DateTime.Now; j.Classification.Value = txtClass.Text; @@ -680,9 +671,6 @@ private void btnFind_Click(object sender, EventArgs e) /// The event parameters private void CalendarObjectDlg_Closing(object sender, CancelEventArgs e) { - Duration d; - double latitude, longitude; - // Ignore on cancel if(this.DialogResult == DialogResult.Cancel) return; @@ -692,7 +680,7 @@ private void CalendarObjectDlg_Closing(object sender, CancelEventArgs e) tabInfo.SelectedTab = pgGeneral; if(txtDuration.Visible && txtDuration.Text.Length != 0) - if(!Duration.TryParse(txtDuration.Text, out d)) + if(!Duration.TryParse(txtDuration.Text, out Duration d)) { e.Cancel = true; epErrors.SetError(txtDuration, "Invalid duration value"); @@ -716,7 +704,7 @@ private void CalendarObjectDlg_Closing(object sender, CancelEventArgs e) if(txtLatitude.Enabled) { if(txtLatitude.Text.Length != 0) - if(!Double.TryParse(txtLatitude.Text, out latitude) || latitude < -90.0 || latitude > 90.0) + if(!Double.TryParse(txtLatitude.Text, out double latitude) || latitude < -90.0 || latitude > 90.0) { e.Cancel = true; epErrors.SetError(txtLatitude, "Latitude must be a valid numeric value between -90 and 90"); @@ -725,7 +713,7 @@ private void CalendarObjectDlg_Closing(object sender, CancelEventArgs e) } if(txtLongitude.Text.Length != 0) - if(!Double.TryParse(txtLongitude.Text, out longitude) || longitude < -180.0 || longitude > 180.0) + if(!Double.TryParse(txtLongitude.Text, out double longitude) || longitude < -180.0 || longitude > 180.0) { e.Cancel = true; epErrors.SetError(txtLongitude, "Longitude must be a valid numeric value between -180 and 180"); diff --git a/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.resx b/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.resx index 57b773c..ad7a064 100644 --- a/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.resx +++ b/Source/CSharpDemos/CalendarBrowser/CalendarObjectDlg.resx @@ -121,6 +121,6 @@ 17, 17 - 45 + 108 \ No newline at end of file diff --git a/Source/CSharpDemos/CalendarBrowser/FreeBusyControl.Designer.cs b/Source/CSharpDemos/CalendarBrowser/FreeBusyControl.Designer.cs index 662f559..36ebe48 100644 --- a/Source/CSharpDemos/CalendarBrowser/FreeBusyControl.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/FreeBusyControl.Designer.cs @@ -43,17 +43,17 @@ private void InitializeComponent() this.dtpStartDate.Checked = false; this.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStartDate.Location = new System.Drawing.Point(64, 48); + this.dtpStartDate.Location = new System.Drawing.Point(95, 53); this.dtpStartDate.Name = "dtpStartDate"; this.dtpStartDate.ShowCheckBox = true; - this.dtpStartDate.Size = new System.Drawing.Size(210, 22); + this.dtpStartDate.Size = new System.Drawing.Size(255, 26); this.dtpStartDate.TabIndex = 5; // // label1 // - this.label1.Location = new System.Drawing.Point(18, 48); + this.label1.Location = new System.Drawing.Point(19, 57); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(40, 23); + this.label1.Size = new System.Drawing.Size(70, 23); this.label1.TabIndex = 4; this.label1.Text = "Start"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -63,17 +63,17 @@ private void InitializeComponent() this.dtpEndDate.Checked = false; this.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEndDate.Location = new System.Drawing.Point(64, 88); + this.dtpEndDate.Location = new System.Drawing.Point(95, 90); this.dtpEndDate.Name = "dtpEndDate"; this.dtpEndDate.ShowCheckBox = true; - this.dtpEndDate.Size = new System.Drawing.Size(210, 22); + this.dtpEndDate.Size = new System.Drawing.Size(255, 26); this.dtpEndDate.TabIndex = 7; // // label2 // - this.label2.Location = new System.Drawing.Point(18, 88); + this.label2.Location = new System.Drawing.Point(23, 94); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(40, 23); + this.label2.Size = new System.Drawing.Size(66, 23); this.label2.TabIndex = 6; this.label2.Text = "End"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -88,18 +88,18 @@ private void InitializeComponent() "Unavailable", "Tentative", "Other"}); - this.cboBusyType.Location = new System.Drawing.Point(64, 8); + this.cboBusyType.Location = new System.Drawing.Point(95, 14); this.cboBusyType.Name = "cboBusyType"; - this.cboBusyType.Size = new System.Drawing.Size(112, 24); + this.cboBusyType.Size = new System.Drawing.Size(128, 28); this.cboBusyType.TabIndex = 1; this.cboBusyType.SelectedIndexChanged += new System.EventHandler(this.cboBusyType_SelectedIndexChanged); this.cboBusyType.Validating += new System.ComponentModel.CancelEventHandler(this.cboBusyType_Validating); // // label10 // - this.label10.Location = new System.Drawing.Point(10, 8); + this.label10.Location = new System.Drawing.Point(15, 16); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(48, 23); + this.label10.Size = new System.Drawing.Size(74, 23); this.label10.TabIndex = 0; this.label10.Text = "Type"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -107,16 +107,16 @@ private void InitializeComponent() // txtOtherType // this.txtOtherType.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.txtOtherType.Location = new System.Drawing.Point(272, 8); + this.txtOtherType.Location = new System.Drawing.Point(342, 14); this.txtOtherType.Name = "txtOtherType"; - this.txtOtherType.Size = new System.Drawing.Size(136, 22); + this.txtOtherType.Size = new System.Drawing.Size(136, 26); this.txtOtherType.TabIndex = 3; // // label4 // - this.label4.Location = new System.Drawing.Point(186, 8); + this.label4.Location = new System.Drawing.Point(229, 16); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(80, 23); + this.label4.Size = new System.Drawing.Size(107, 23); this.label4.TabIndex = 2; this.label4.Text = "Other Type"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -132,7 +132,7 @@ private void InitializeComponent() this.Controls.Add(this.dtpStartDate); this.Controls.Add(this.label1); this.Name = "FreeBusyControl"; - this.Size = new System.Drawing.Size(436, 152); + this.Size = new System.Drawing.Size(503, 161); this.Controls.SetChildIndex(this.label1, 0); this.Controls.SetChildIndex(this.dtpStartDate, 0); this.Controls.SetChildIndex(this.label2, 0); diff --git a/Source/CSharpDemos/CalendarBrowser/ObservanceRuleControl.Designer.cs b/Source/CSharpDemos/CalendarBrowser/ObservanceRuleControl.Designer.cs index 8adec31..e87f434 100644 --- a/Source/CSharpDemos/CalendarBrowser/ObservanceRuleControl.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/ObservanceRuleControl.Designer.cs @@ -63,10 +63,10 @@ private void InitializeComponent() // this.tabTimeZone.Controls.Add(this.pgGeneral); this.tabTimeZone.Controls.Add(this.pgRules); - this.tabTimeZone.Location = new System.Drawing.Point(8, 1); + this.tabTimeZone.Location = new System.Drawing.Point(3, 3); this.tabTimeZone.Name = "tabTimeZone"; this.tabTimeZone.SelectedIndex = 0; - this.tabTimeZone.Size = new System.Drawing.Size(552, 315); + this.tabTimeZone.Size = new System.Drawing.Size(694, 355); this.tabTimeZone.TabIndex = 0; // // pgGeneral @@ -89,9 +89,9 @@ private void InitializeComponent() this.pgGeneral.Controls.Add(this.label2); this.pgGeneral.Controls.Add(this.dtpStartDate); this.pgGeneral.Controls.Add(this.label1); - this.pgGeneral.Location = new System.Drawing.Point(4, 25); + this.pgGeneral.Location = new System.Drawing.Point(4, 29); this.pgGeneral.Name = "pgGeneral"; - this.pgGeneral.Size = new System.Drawing.Size(544, 286); + this.pgGeneral.Size = new System.Drawing.Size(686, 322); this.pgGeneral.TabIndex = 0; this.pgGeneral.Text = "General"; this.pgGeneral.UseVisualStyleBackColor = true; @@ -99,16 +99,16 @@ private void InitializeComponent() // cboRuleType // this.cboRuleType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboRuleType.Location = new System.Drawing.Point(136, 24); + this.cboRuleType.Location = new System.Drawing.Point(174, 24); this.cboRuleType.Name = "cboRuleType"; - this.cboRuleType.Size = new System.Drawing.Size(112, 24); + this.cboRuleType.Size = new System.Drawing.Size(112, 28); this.cboRuleType.TabIndex = 1; // // label10 // - this.label10.Location = new System.Drawing.Point(82, 24); + this.label10.Location = new System.Drawing.Point(100, 26); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(48, 23); + this.label10.Size = new System.Drawing.Size(68, 23); this.label10.TabIndex = 0; this.label10.Text = "Type"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -116,16 +116,16 @@ private void InitializeComponent() // label7 // this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label7.Location = new System.Drawing.Point(294, 135); + this.label7.Location = new System.Drawing.Point(384, 137); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(70, 23); + this.label7.Size = new System.Drawing.Size(90, 23); this.label7.TabIndex = 15; this.label7.Text = "Minutes"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // udcToMinutes // - this.udcToMinutes.Location = new System.Drawing.Point(240, 136); + this.udcToMinutes.Location = new System.Drawing.Point(318, 136); this.udcToMinutes.Maximum = new decimal(new int[] { 59, 0, @@ -137,7 +137,7 @@ private void InitializeComponent() 0, -2147483648}); this.udcToMinutes.Name = "udcToMinutes"; - this.udcToMinutes.Size = new System.Drawing.Size(48, 22); + this.udcToMinutes.Size = new System.Drawing.Size(60, 26); this.udcToMinutes.TabIndex = 14; this.udcToMinutes.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.udcToMinutes.Validating += new System.ComponentModel.CancelEventHandler(this.Minutes_Validating); @@ -145,16 +145,16 @@ private void InitializeComponent() // label8 // this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label8.Location = new System.Drawing.Point(190, 136); + this.label8.Location = new System.Drawing.Point(240, 137); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(48, 23); + this.label8.Size = new System.Drawing.Size(72, 23); this.label8.TabIndex = 13; this.label8.Text = "Hours"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // udcToHours // - this.udcToHours.Location = new System.Drawing.Point(136, 136); + this.udcToHours.Location = new System.Drawing.Point(174, 136); this.udcToHours.Maximum = new decimal(new int[] { 23, 0, @@ -166,16 +166,16 @@ private void InitializeComponent() 0, -2147483648}); this.udcToHours.Name = "udcToHours"; - this.udcToHours.Size = new System.Drawing.Size(48, 22); + this.udcToHours.Size = new System.Drawing.Size(60, 26); this.udcToHours.TabIndex = 12; this.udcToHours.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // label9 // this.label9.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label9.Location = new System.Drawing.Point(58, 136); + this.label9.Location = new System.Drawing.Point(39, 137); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(72, 23); + this.label9.Size = new System.Drawing.Size(129, 23); this.label9.TabIndex = 11; this.label9.Text = "Offset To"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -183,9 +183,9 @@ private void InitializeComponent() // label6 // this.label6.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label6.Location = new System.Drawing.Point(294, 103); + this.label6.Location = new System.Drawing.Point(384, 103); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(70, 23); + this.label6.Size = new System.Drawing.Size(90, 23); this.label6.TabIndex = 10; this.label6.Text = "Minutes"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -193,42 +193,42 @@ private void InitializeComponent() // txtComment // this.txtComment.AcceptsReturn = true; - this.txtComment.Location = new System.Drawing.Point(136, 176); + this.txtComment.Location = new System.Drawing.Point(174, 176); this.txtComment.Multiline = true; this.txtComment.Name = "txtComment"; this.txtComment.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtComment.Size = new System.Drawing.Size(392, 72); + this.txtComment.Size = new System.Drawing.Size(455, 118); this.txtComment.TabIndex = 17; // // label5 // - this.label5.Location = new System.Drawing.Point(58, 176); + this.label5.Location = new System.Drawing.Point(43, 178); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(72, 23); + this.label5.Size = new System.Drawing.Size(125, 23); this.label5.TabIndex = 16; this.label5.Text = "Comment"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtTZName // - this.txtTZName.Location = new System.Drawing.Point(136, 64); + this.txtTZName.Location = new System.Drawing.Point(174, 64); this.txtTZName.Name = "txtTZName"; - this.txtTZName.Size = new System.Drawing.Size(264, 22); + this.txtTZName.Size = new System.Drawing.Size(264, 26); this.txtTZName.TabIndex = 5; this.txtTZName.Validating += new System.ComponentModel.CancelEventHandler(this.txtTZName_Validating); // // label4 // - this.label4.Location = new System.Drawing.Point(10, 64); + this.label4.Location = new System.Drawing.Point(16, 66); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(120, 23); + this.label4.Size = new System.Drawing.Size(152, 23); this.label4.TabIndex = 4; this.label4.Text = "Time Zone Name"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // udcFromMinutes // - this.udcFromMinutes.Location = new System.Drawing.Point(240, 104); + this.udcFromMinutes.Location = new System.Drawing.Point(318, 104); this.udcFromMinutes.Maximum = new decimal(new int[] { 59, 0, @@ -240,7 +240,7 @@ private void InitializeComponent() 0, -2147483648}); this.udcFromMinutes.Name = "udcFromMinutes"; - this.udcFromMinutes.Size = new System.Drawing.Size(48, 22); + this.udcFromMinutes.Size = new System.Drawing.Size(60, 26); this.udcFromMinutes.TabIndex = 9; this.udcFromMinutes.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.udcFromMinutes.Validating += new System.ComponentModel.CancelEventHandler(this.Minutes_Validating); @@ -248,16 +248,16 @@ private void InitializeComponent() // label3 // this.label3.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label3.Location = new System.Drawing.Point(190, 103); + this.label3.Location = new System.Drawing.Point(240, 105); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(48, 23); + this.label3.Size = new System.Drawing.Size(72, 23); this.label3.TabIndex = 8; this.label3.Text = "Hours"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // udcFromHours // - this.udcFromHours.Location = new System.Drawing.Point(136, 104); + this.udcFromHours.Location = new System.Drawing.Point(174, 104); this.udcFromHours.Maximum = new decimal(new int[] { 23, 0, @@ -269,16 +269,16 @@ private void InitializeComponent() 0, -2147483648}); this.udcFromHours.Name = "udcFromHours"; - this.udcFromHours.Size = new System.Drawing.Size(48, 22); + this.udcFromHours.Size = new System.Drawing.Size(60, 26); this.udcFromHours.TabIndex = 7; this.udcFromHours.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // label2 // this.label2.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label2.Location = new System.Drawing.Point(34, 103); + this.label2.Location = new System.Drawing.Point(35, 105); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(96, 23); + this.label2.Size = new System.Drawing.Size(133, 23); this.label2.TabIndex = 6; this.label2.Text = "Offset From"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -288,16 +288,16 @@ private void InitializeComponent() this.dtpStartDate.Checked = false; this.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStartDate.Location = new System.Drawing.Point(312, 24); + this.dtpStartDate.Location = new System.Drawing.Point(394, 24); this.dtpStartDate.Name = "dtpStartDate"; - this.dtpStartDate.Size = new System.Drawing.Size(190, 22); + this.dtpStartDate.Size = new System.Drawing.Size(235, 26); this.dtpStartDate.TabIndex = 3; // // label1 // - this.label1.Location = new System.Drawing.Point(256, 24); + this.label1.Location = new System.Drawing.Point(325, 26); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(50, 23); + this.label1.Size = new System.Drawing.Size(63, 23); this.label1.TabIndex = 2; this.label1.Text = "&Start"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -305,9 +305,9 @@ private void InitializeComponent() // pgRules // this.pgRules.Controls.Add(this.rcRulesDates); - this.pgRules.Location = new System.Drawing.Point(4, 25); + this.pgRules.Location = new System.Drawing.Point(4, 29); this.pgRules.Name = "pgRules"; - this.pgRules.Size = new System.Drawing.Size(544, 286); + this.pgRules.Size = new System.Drawing.Size(686, 322); this.pgRules.TabIndex = 1; this.pgRules.Text = "Rules"; this.pgRules.UseVisualStyleBackColor = true; @@ -317,14 +317,14 @@ private void InitializeComponent() this.rcRulesDates.Dock = System.Windows.Forms.DockStyle.Fill; this.rcRulesDates.Location = new System.Drawing.Point(0, 0); this.rcRulesDates.Name = "rcRulesDates"; - this.rcRulesDates.Size = new System.Drawing.Size(544, 286); + this.rcRulesDates.Size = new System.Drawing.Size(686, 322); this.rcRulesDates.TabIndex = 0; // // ObservanceRuleControl // this.Controls.Add(this.tabTimeZone); this.Name = "ObservanceRuleControl"; - this.Size = new System.Drawing.Size(568, 344); + this.Size = new System.Drawing.Size(701, 390); this.Leave += new System.EventHandler(this.ObservanceRuleControl_Leave); this.Controls.SetChildIndex(this.tabTimeZone, 0); this.tabTimeZone.ResumeLayout(false); diff --git a/Source/CSharpDemos/CalendarBrowser/Properties/AssemblyInfoShared.cs b/Source/CSharpDemos/CalendarBrowser/Properties/AssemblyInfoShared.cs index b343798..2d9bc5c 100644 --- a/Source/CSharpDemos/CalendarBrowser/Properties/AssemblyInfoShared.cs +++ b/Source/CSharpDemos/CalendarBrowser/Properties/AssemblyInfoShared.cs @@ -2,7 +2,7 @@ // System : EWSoftware PDI Demonstration Applications // File : AssemblyInfo.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/19/2018 +// Updated : 12/01/2018 // Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -52,5 +52,5 @@ // Day of release // Revision (typically zero unless multiple releases are made on the same day) // -[assembly: AssemblyVersion("2018.11.19.0")] -[assembly: AssemblyFileVersion("18.11.19.0")] +[assembly: AssemblyVersion("2018.12.1.0")] +[assembly: AssemblyFileVersion("18.12.1.0")] diff --git a/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.Designer.cs b/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.Designer.cs index 0728ed4..59e1ffc 100644 --- a/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.Designer.cs @@ -47,9 +47,9 @@ private void InitializeComponent() // btnClearRRules // this.btnClearRRules.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnClearRRules.Location = new System.Drawing.Point(251, 248); + this.btnClearRRules.Location = new System.Drawing.Point(285, 282); this.btnClearRRules.Name = "btnClearRRules"; - this.btnClearRRules.Size = new System.Drawing.Size(75, 28); + this.btnClearRRules.Size = new System.Drawing.Size(88, 32); this.btnClearRRules.TabIndex = 5; this.btnClearRRules.Text = "Clear"; this.btnClearRRules.Click += new System.EventHandler(this.btnClearRRules_Click); @@ -57,9 +57,9 @@ private void InitializeComponent() // btnRemoveRRule // this.btnRemoveRRule.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnRemoveRRule.Location = new System.Drawing.Point(170, 248); + this.btnRemoveRRule.Location = new System.Drawing.Point(191, 282); this.btnRemoveRRule.Name = "btnRemoveRRule"; - this.btnRemoveRRule.Size = new System.Drawing.Size(75, 28); + this.btnRemoveRRule.Size = new System.Drawing.Size(88, 32); this.btnRemoveRRule.TabIndex = 4; this.btnRemoveRRule.Text = "Remove"; this.btnRemoveRRule.Click += new System.EventHandler(this.btnRemoveRRule_Click); @@ -67,9 +67,9 @@ private void InitializeComponent() // btnAddRRule // this.btnAddRRule.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnAddRRule.Location = new System.Drawing.Point(8, 248); + this.btnAddRRule.Location = new System.Drawing.Point(3, 282); this.btnAddRRule.Name = "btnAddRRule"; - this.btnAddRRule.Size = new System.Drawing.Size(75, 28); + this.btnAddRRule.Size = new System.Drawing.Size(88, 32); this.btnAddRRule.TabIndex = 2; this.btnAddRRule.Text = "Add"; this.btnAddRRule.Click += new System.EventHandler(this.btnAddRRule_Click); @@ -78,18 +78,19 @@ private void InitializeComponent() // this.lbRRules.HorizontalExtent = 800; this.lbRRules.HorizontalScrollbar = true; - this.lbRRules.ItemHeight = 16; - this.lbRRules.Location = new System.Drawing.Point(8, 32); + this.lbRRules.IntegralHeight = false; + this.lbRRules.ItemHeight = 20; + this.lbRRules.Location = new System.Drawing.Point(3, 34); this.lbRRules.Name = "lbRRules"; - this.lbRRules.Size = new System.Drawing.Size(320, 212); + this.lbRRules.Size = new System.Drawing.Size(370, 242); this.lbRRules.TabIndex = 1; // // btnClearRDates // this.btnClearRDates.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnClearRDates.Location = new System.Drawing.Point(347, 248); + this.btnClearRDates.Location = new System.Drawing.Point(584, 282); this.btnClearRDates.Name = "btnClearRDates"; - this.btnClearRDates.Size = new System.Drawing.Size(75, 28); + this.btnClearRDates.Size = new System.Drawing.Size(88, 32); this.btnClearRDates.TabIndex = 13; this.btnClearRDates.Text = "Clear"; this.btnClearRDates.Click += new System.EventHandler(this.btnClearRDates_Click); @@ -97,9 +98,9 @@ private void InitializeComponent() // btnRemoveRDate // this.btnRemoveRDate.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnRemoveRDate.Location = new System.Drawing.Point(447, 218); + this.btnRemoveRDate.Location = new System.Drawing.Point(490, 282); this.btnRemoveRDate.Name = "btnRemoveRDate"; - this.btnRemoveRDate.Size = new System.Drawing.Size(75, 28); + this.btnRemoveRDate.Size = new System.Drawing.Size(88, 32); this.btnRemoveRDate.TabIndex = 12; this.btnRemoveRDate.Text = "Remove"; this.btnRemoveRDate.Click += new System.EventHandler(this.btnRemoveRDate_Click); @@ -107,24 +108,25 @@ private void InitializeComponent() // btnAddRDate // this.btnAddRDate.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnAddRDate.Location = new System.Drawing.Point(346, 218); + this.btnAddRDate.Location = new System.Drawing.Point(396, 282); this.btnAddRDate.Name = "btnAddRDate"; - this.btnAddRDate.Size = new System.Drawing.Size(75, 28); + this.btnAddRDate.Size = new System.Drawing.Size(88, 32); this.btnAddRDate.TabIndex = 11; this.btnAddRDate.Text = "Add"; this.btnAddRDate.Click += new System.EventHandler(this.btnAddRDate_Click); // // lbRDates // - this.lbRDates.ItemHeight = 16; - this.lbRDates.Location = new System.Drawing.Point(346, 80); + this.lbRDates.IntegralHeight = false; + this.lbRDates.ItemHeight = 20; + this.lbRDates.Location = new System.Drawing.Point(396, 96); this.lbRDates.Name = "lbRDates"; - this.lbRDates.Size = new System.Drawing.Size(176, 132); + this.lbRDates.Size = new System.Drawing.Size(276, 180); this.lbRDates.TabIndex = 10; // // lblRRules // - this.lblRRules.Location = new System.Drawing.Point(8, 8); + this.lblRRules.Location = new System.Drawing.Point(3, 8); this.lblRRules.Name = "lblRRules"; this.lblRRules.Size = new System.Drawing.Size(216, 23); this.lblRRules.TabIndex = 0; @@ -133,7 +135,7 @@ private void InitializeComponent() // // lblRDates // - this.lblRDates.Location = new System.Drawing.Point(346, 8); + this.lblRDates.Location = new System.Drawing.Point(397, 8); this.lblRDates.Name = "lblRDates"; this.lblRDates.Size = new System.Drawing.Size(174, 23); this.lblRDates.TabIndex = 7; @@ -145,34 +147,34 @@ private void InitializeComponent() this.dtpRDate.Checked = false; this.dtpRDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpRDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpRDate.Location = new System.Drawing.Point(346, 32); + this.dtpRDate.Location = new System.Drawing.Point(395, 34); this.dtpRDate.Name = "dtpRDate"; - this.dtpRDate.Size = new System.Drawing.Size(190, 22); + this.dtpRDate.Size = new System.Drawing.Size(235, 26); this.dtpRDate.TabIndex = 8; // // btnEditRRule // this.btnEditRRule.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnEditRRule.Location = new System.Drawing.Point(89, 248); + this.btnEditRRule.Location = new System.Drawing.Point(97, 282); this.btnEditRRule.Name = "btnEditRRule"; - this.btnEditRRule.Size = new System.Drawing.Size(75, 28); + this.btnEditRRule.Size = new System.Drawing.Size(88, 32); this.btnEditRRule.TabIndex = 3; this.btnEditRRule.Text = "Edit"; this.btnEditRRule.Click += new System.EventHandler(this.btnEditRRule_Click); // // groupBox1 // - this.groupBox1.Location = new System.Drawing.Point(336, 8); + this.groupBox1.Location = new System.Drawing.Point(387, 8); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(2, 270); + this.groupBox1.Size = new System.Drawing.Size(2, 300); this.groupBox1.TabIndex = 6; this.groupBox1.TabStop = false; // // chkExcludeDay // - this.chkExcludeDay.Location = new System.Drawing.Point(347, 56); + this.chkExcludeDay.Location = new System.Drawing.Point(393, 66); this.chkExcludeDay.Name = "chkExcludeDay"; - this.chkExcludeDay.Size = new System.Drawing.Size(152, 24); + this.chkExcludeDay.Size = new System.Drawing.Size(201, 24); this.chkExcludeDay.TabIndex = 9; this.chkExcludeDay.Text = "Exclude whole day"; // @@ -193,7 +195,7 @@ private void InitializeComponent() this.Controls.Add(this.btnAddRRule); this.Controls.Add(this.lbRRules); this.Name = "RecurrenceControl"; - this.Size = new System.Drawing.Size(542, 286); + this.Size = new System.Drawing.Size(685, 320); this.ResumeLayout(false); } diff --git a/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.cs b/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.cs index 9fb03a8..64eae5f 100644 --- a/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.cs +++ b/Source/CSharpDemos/CalendarBrowser/RecurrenceControl.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : RecurrenceControl.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit a recurring calendar object's recurrence rule and recurrence date properties @@ -56,7 +56,7 @@ public partial class RecurrenceControl : System.Windows.Forms.UserControl Description("False for recurrence items, true for exception items")] public bool EditsExceptions { - get { return editsExceptions; } + get => editsExceptions; set { editsExceptions = value; @@ -158,10 +158,13 @@ public void SetValues(RRulePropertyCollection er, ExDatePropertyCollection ed) // Convert the exception dates to RDate format internally foreach(ExDateProperty edate in ed) { - RDateProperty rd = new RDateProperty(); - rd.ValueLocation = edate.ValueLocation; - rd.TimeZoneId = edate.TimeZoneId; - rd.TimeZoneDateTime = edate.TimeZoneDateTime; + RDateProperty rd = new RDateProperty + { + ValueLocation = edate.ValueLocation, + TimeZoneId = edate.TimeZoneId, + TimeZoneDateTime = edate.TimeZoneDateTime + }; + rDates.Add(rd); } @@ -212,10 +215,13 @@ public void GetValues(RRulePropertyCollection er, ExDatePropertyCollection ed) // Convert the RDates to ExDate format foreach(RDateProperty rdate in rDates) { - ExDateProperty edate = new ExDateProperty(); - edate.ValueLocation = rdate.ValueLocation; - edate.TimeZoneId = rdate.TimeZoneId; - edate.TimeZoneDateTime = rdate.TimeZoneDateTime; + ExDateProperty edate = new ExDateProperty + { + ValueLocation = rdate.ValueLocation, + TimeZoneId = rdate.TimeZoneId, + TimeZoneDateTime = rdate.TimeZoneDateTime + }; + ed.Add(edate); } } @@ -362,16 +368,19 @@ private void btnAddRDate_Click(object sender, EventArgs e) // time part is omitted. if(chkExcludeDay.Checked) { - RDateProperty rdate = new RDateProperty(); - rdate.ValueLocation = ValLocValue.Date; - rdate.TimeZoneDateTime = dtpRDate.Value.Date; + RDateProperty rdate = new RDateProperty + { + ValueLocation = ValLocValue.Date, + TimeZoneDateTime = dtpRDate.Value.Date + }; + rDates.Add(rdate); lbRDates.Items.Add(dtpRDate.Value.Date.ToString("d")); } else { - RDateProperty rdate = new RDateProperty(); - rdate.TimeZoneDateTime = dtpRDate.Value; + RDateProperty rdate = new RDateProperty { TimeZoneDateTime = dtpRDate.Value }; + rDates.Add(rdate); lbRDates.Items.Add(dtpRDate.Value.ToString("G")); } diff --git a/Source/CSharpDemos/CalendarBrowser/RequestStatusControl.Designer.cs b/Source/CSharpDemos/CalendarBrowser/RequestStatusControl.Designer.cs index d093490..5274167 100644 --- a/Source/CSharpDemos/CalendarBrowser/RequestStatusControl.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/RequestStatusControl.Designer.cs @@ -38,50 +38,50 @@ private void InitializeComponent() // // txtStatusCode // - this.txtStatusCode.Location = new System.Drawing.Point(120, 8); + this.txtStatusCode.Location = new System.Drawing.Point(152, 8); this.txtStatusCode.Name = "txtStatusCode"; - this.txtStatusCode.Size = new System.Drawing.Size(128, 22); + this.txtStatusCode.Size = new System.Drawing.Size(156, 26); this.txtStatusCode.TabIndex = 1; this.txtStatusCode.Validating += new System.ComponentModel.CancelEventHandler(this.txtStatusCode_Validating); // // label5 // - this.label5.Location = new System.Drawing.Point(26, 8); + this.label5.Location = new System.Drawing.Point(35, 10); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(88, 23); + this.label5.Size = new System.Drawing.Size(111, 23); this.label5.TabIndex = 0; this.label5.Text = "Status Code"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtMessage // - this.txtMessage.Location = new System.Drawing.Point(120, 40); + this.txtMessage.Location = new System.Drawing.Point(152, 40); this.txtMessage.Name = "txtMessage"; - this.txtMessage.Size = new System.Drawing.Size(264, 22); + this.txtMessage.Size = new System.Drawing.Size(292, 26); this.txtMessage.TabIndex = 3; this.txtMessage.Validating += new System.ComponentModel.CancelEventHandler(this.txtMessage_Validating); // // label1 // - this.label1.Location = new System.Drawing.Point(29, 40); + this.label1.Location = new System.Drawing.Point(29, 42); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(85, 23); + this.label1.Size = new System.Drawing.Size(117, 23); this.label1.TabIndex = 2; this.label1.Text = "Message"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtExtData // - this.txtExtData.Location = new System.Drawing.Point(120, 72); + this.txtExtData.Location = new System.Drawing.Point(152, 72); this.txtExtData.Name = "txtExtData"; - this.txtExtData.Size = new System.Drawing.Size(264, 22); + this.txtExtData.Size = new System.Drawing.Size(292, 26); this.txtExtData.TabIndex = 5; // // label2 // - this.label2.Location = new System.Drawing.Point(4, 72); + this.label2.Location = new System.Drawing.Point(3, 74); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(110, 23); + this.label2.Size = new System.Drawing.Size(143, 23); this.label2.TabIndex = 4; this.label2.Text = "Extended Data"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -95,7 +95,7 @@ private void InitializeComponent() this.Controls.Add(this.txtStatusCode); this.Controls.Add(this.label5); this.Name = "RequestStatusControl"; - this.Size = new System.Drawing.Size(400, 136); + this.Size = new System.Drawing.Size(458, 136); this.Controls.SetChildIndex(this.label5, 0); this.Controls.SetChildIndex(this.txtStatusCode, 0); this.Controls.SetChildIndex(this.label1, 0); diff --git a/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.Designer.cs b/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.Designer.cs index ea63b1c..2a84ffd 100644 --- a/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.Designer.cs @@ -78,7 +78,7 @@ private void InitializeComponent() this.chkLimitToCalendar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkLimitToCalendar.Location = new System.Drawing.Point(12, 486); this.chkLimitToCalendar.Name = "chkLimitToCalendar"; - this.chkLimitToCalendar.Size = new System.Drawing.Size(345, 24); + this.chkLimitToCalendar.Size = new System.Drawing.Size(467, 24); this.chkLimitToCalendar.TabIndex = 1; this.chkLimitToCalendar.Text = "&Limit to time zones used in the loaded calendar"; this.chkLimitToCalendar.CheckedChanged += new System.EventHandler(this.chkLimitToCalendar_CheckedChanged); diff --git a/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.cs b/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.cs index 219bd2c..687023e 100644 --- a/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.cs +++ b/Source/CSharpDemos/CalendarBrowser/TimeZoneListDlg.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : TimeZoneListDlg.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit view and edit time zones and apply them to the calendar @@ -36,9 +36,7 @@ public partial class TimeZoneListDlg : System.Windows.Forms.Form #region Private data members //===================================================================== - private VCalendar vCal; private VTimeZoneCollection timeZones; - private bool wasModified; #endregion @@ -48,20 +46,13 @@ public partial class TimeZoneListDlg : System.Windows.Forms.Form /// /// Get or set the currently loaded calendar /// - public VCalendar CurrentCalendar - { - get { return vCal; } - set { vCal = value; } - } + public VCalendar CurrentCalendar { get; set; } /// /// Set or get the modified state /// - public bool Modified - { - get { return wasModified; } - set { wasModified = value; } - } + public bool Modified { get; set; } + #endregion #region Constructor @@ -80,7 +71,6 @@ public TimeZoneListDlg() CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " " + CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern; - vCal = null; timeZones = new VTimeZoneCollection(); LoadGridWithItems(); } @@ -105,9 +95,9 @@ private void LoadGridWithItems() // Get just the time zones used StringCollection timeZonesUsed = new StringCollection(); - if(vCal != null) + if(this.CurrentCalendar != null) { - vCal.TimeZonesUsed(timeZonesUsed); + this.CurrentCalendar.TimeZonesUsed(timeZonesUsed); // Remove entries that don't exist for(int idx = 0; idx < timeZonesUsed.Count; idx++) @@ -176,8 +166,9 @@ private void btnAdd_Click(object sender, EventArgs e) dlg.GetValues(tz); VCalendar.TimeZones.Add(tz); - wasModified = true; - LoadGridWithItems(); + + this.Modified = true; + this.LoadGridWithItems(); } } } @@ -204,8 +195,9 @@ private void btnEdit_Click(object sender, EventArgs e) if(dlg.ShowDialog() == DialogResult.OK) { dlg.GetValues(VCalendar.TimeZones[timeZoneId]); - wasModified = true; - LoadGridWithItems(); + + this.Modified = true; + this.LoadGridWithItems(); } } } @@ -228,8 +220,8 @@ private void btnDelete_Click(object sender, EventArgs e) string timeZoneId = (string)dgvCalendar[0, dgvCalendar.CurrentCellAddress.Y].Value; - if(vCal != null) - vCal.TimeZonesUsed(timeZonesUsed); + if(this.CurrentCalendar != null) + this.CurrentCalendar.TimeZonesUsed(timeZonesUsed); if(timeZonesUsed.Contains(timeZoneId)) { @@ -242,8 +234,9 @@ private void btnDelete_Click(object sender, EventArgs e) MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes) { VCalendar.TimeZones.Remove(VCalendar.TimeZones[timeZoneId]); - wasModified = true; - LoadGridWithItems(); + + this.Modified = true; + this.LoadGridWithItems(); } } @@ -267,8 +260,10 @@ private void btnApply_Click(object sender, EventArgs e) MessageBoxDefaultButton.Button2) == DialogResult.Yes) { string timeZoneId = (string)dgvCalendar[0, dgvCalendar.CurrentCellAddress.Y].Value; - vCal.ApplyTimeZone(VCalendar.TimeZones[timeZoneId]); - wasModified = true; + + this.CurrentCalendar.ApplyTimeZone(VCalendar.TimeZones[timeZoneId]); + + this.Modified = true; } } #endregion diff --git a/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.Designer.cs b/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.Designer.cs index 5b02069..3ba3a50 100644 --- a/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.Designer.cs @@ -69,18 +69,18 @@ private void InitializeComponent() // // txtUniqueId // - this.txtUniqueId.Location = new System.Drawing.Point(96, 12); + this.txtUniqueId.Location = new System.Drawing.Point(141, 12); this.txtUniqueId.Name = "txtUniqueId"; this.txtUniqueId.ReadOnly = true; - this.txtUniqueId.Size = new System.Drawing.Size(380, 22); + this.txtUniqueId.Size = new System.Drawing.Size(380, 26); this.txtUniqueId.TabIndex = 1; this.txtUniqueId.TabStop = false; // // label9 // - this.label9.Location = new System.Drawing.Point(14, 12); + this.label9.Location = new System.Drawing.Point(32, 14); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(76, 23); + this.label9.Size = new System.Drawing.Size(103, 23); this.label9.TabIndex = 0; this.label9.Text = "Unique ID"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -91,10 +91,10 @@ private void InitializeComponent() this.tabInfo.Controls.Add(this.pgAttendees); this.tabInfo.Controls.Add(this.pgFreeBusy); this.tabInfo.Controls.Add(this.pgReqStats); - this.tabInfo.Location = new System.Drawing.Point(12, 138); + this.tabInfo.Location = new System.Drawing.Point(12, 149); this.tabInfo.Name = "tabInfo"; this.tabInfo.SelectedIndex = 0; - this.tabInfo.Size = new System.Drawing.Size(599, 256); + this.tabInfo.Size = new System.Drawing.Size(742, 297); this.tabInfo.TabIndex = 9; // // pgGeneral @@ -109,27 +109,27 @@ private void InitializeComponent() this.pgGeneral.Controls.Add(this.label17); this.pgGeneral.Controls.Add(this.txtUrl); this.pgGeneral.Controls.Add(this.label3); - this.pgGeneral.Location = new System.Drawing.Point(4, 25); + this.pgGeneral.Location = new System.Drawing.Point(4, 29); this.pgGeneral.Name = "pgGeneral"; - this.pgGeneral.Size = new System.Drawing.Size(591, 227); + this.pgGeneral.Size = new System.Drawing.Size(734, 264); this.pgGeneral.TabIndex = 3; this.pgGeneral.Text = "General"; this.pgGeneral.UseVisualStyleBackColor = true; // // label2 // - this.label2.Location = new System.Drawing.Point(312, 16); + this.label2.Location = new System.Drawing.Point(391, 16); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(40, 23); + this.label2.Size = new System.Drawing.Size(54, 23); this.label2.TabIndex = 2; this.label2.Text = "End"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtDuration // - this.txtDuration.Location = new System.Drawing.Point(96, 56); + this.txtDuration.Location = new System.Drawing.Point(116, 56); this.txtDuration.Name = "txtDuration"; - this.txtDuration.Size = new System.Drawing.Size(108, 22); + this.txtDuration.Size = new System.Drawing.Size(116, 26); this.txtDuration.TabIndex = 5; // // dtpEndDate @@ -137,10 +137,10 @@ private void InitializeComponent() this.dtpEndDate.Checked = false; this.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEndDate.Location = new System.Drawing.Point(358, 16); + this.dtpEndDate.Location = new System.Drawing.Point(451, 16); this.dtpEndDate.Name = "dtpEndDate"; this.dtpEndDate.ShowCheckBox = true; - this.dtpEndDate.Size = new System.Drawing.Size(210, 22); + this.dtpEndDate.Size = new System.Drawing.Size(255, 26); this.dtpEndDate.TabIndex = 3; // // dtpStartDate @@ -148,26 +148,26 @@ private void InitializeComponent() this.dtpStartDate.Checked = false; this.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStartDate.Location = new System.Drawing.Point(96, 16); + this.dtpStartDate.Location = new System.Drawing.Point(116, 16); this.dtpStartDate.Name = "dtpStartDate"; this.dtpStartDate.ShowCheckBox = true; - this.dtpStartDate.Size = new System.Drawing.Size(210, 22); + this.dtpStartDate.Size = new System.Drawing.Size(255, 26); this.dtpStartDate.TabIndex = 1; // // label4 // - this.label4.Location = new System.Drawing.Point(15, 56); + this.label4.Location = new System.Drawing.Point(16, 58); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(75, 23); + this.label4.Size = new System.Drawing.Size(94, 23); this.label4.TabIndex = 4; this.label4.Text = "Duration"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label1 // - this.label1.Location = new System.Drawing.Point(40, 16); + this.label1.Location = new System.Drawing.Point(41, 16); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(50, 23); + this.label1.Size = new System.Drawing.Size(69, 23); this.label1.TabIndex = 0; this.label1.Text = "&Start"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -175,34 +175,34 @@ private void InitializeComponent() // txtComments // this.txtComments.AcceptsReturn = true; - this.txtComments.Location = new System.Drawing.Point(96, 136); + this.txtComments.Location = new System.Drawing.Point(116, 136); this.txtComments.Multiline = true; this.txtComments.Name = "txtComments"; this.txtComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtComments.Size = new System.Drawing.Size(424, 72); + this.txtComments.Size = new System.Drawing.Size(590, 110); this.txtComments.TabIndex = 9; // // label17 // - this.label17.Location = new System.Drawing.Point(10, 136); + this.label17.Location = new System.Drawing.Point(10, 138); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(80, 23); + this.label17.Size = new System.Drawing.Size(100, 23); this.label17.TabIndex = 8; this.label17.Text = "&Comments"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtUrl // - this.txtUrl.Location = new System.Drawing.Point(96, 96); + this.txtUrl.Location = new System.Drawing.Point(116, 96); this.txtUrl.Name = "txtUrl"; - this.txtUrl.Size = new System.Drawing.Size(424, 22); + this.txtUrl.Size = new System.Drawing.Size(590, 26); this.txtUrl.TabIndex = 7; // // label3 // - this.label3.Location = new System.Drawing.Point(50, 96); + this.label3.Location = new System.Drawing.Point(47, 98); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(40, 23); + this.label3.Size = new System.Drawing.Size(63, 23); this.label3.TabIndex = 6; this.label3.Text = "&URL"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -210,82 +210,82 @@ private void InitializeComponent() // pgAttendees // this.pgAttendees.Controls.Add(this.ucAttendees); - this.pgAttendees.Location = new System.Drawing.Point(4, 25); + this.pgAttendees.Location = new System.Drawing.Point(4, 29); this.pgAttendees.Name = "pgAttendees"; - this.pgAttendees.Size = new System.Drawing.Size(591, 227); + this.pgAttendees.Size = new System.Drawing.Size(734, 264); this.pgAttendees.TabIndex = 0; this.pgAttendees.Text = "Attendees"; this.pgAttendees.UseVisualStyleBackColor = true; // // ucAttendees // - this.ucAttendees.Location = new System.Drawing.Point(47, 5); + this.ucAttendees.Location = new System.Drawing.Point(90, 25); this.ucAttendees.Name = "ucAttendees"; - this.ucAttendees.Size = new System.Drawing.Size(496, 216); + this.ucAttendees.Size = new System.Drawing.Size(554, 214); this.ucAttendees.TabIndex = 0; // // pgFreeBusy // this.pgFreeBusy.Controls.Add(this.ucFreeBusy); - this.pgFreeBusy.Location = new System.Drawing.Point(4, 25); + this.pgFreeBusy.Location = new System.Drawing.Point(4, 29); this.pgFreeBusy.Name = "pgFreeBusy"; - this.pgFreeBusy.Size = new System.Drawing.Size(591, 227); + this.pgFreeBusy.Size = new System.Drawing.Size(734, 264); this.pgFreeBusy.TabIndex = 1; this.pgFreeBusy.Text = "Free/Busy"; this.pgFreeBusy.UseVisualStyleBackColor = true; // // ucFreeBusy // - this.ucFreeBusy.Location = new System.Drawing.Point(76, 37); + this.ucFreeBusy.Location = new System.Drawing.Point(105, 50); this.ucFreeBusy.Name = "ucFreeBusy"; - this.ucFreeBusy.Size = new System.Drawing.Size(438, 152); + this.ucFreeBusy.Size = new System.Drawing.Size(525, 164); this.ucFreeBusy.TabIndex = 0; // // pgReqStats // this.pgReqStats.Controls.Add(this.ucRequestStatus); - this.pgReqStats.Location = new System.Drawing.Point(4, 25); + this.pgReqStats.Location = new System.Drawing.Point(4, 29); this.pgReqStats.Name = "pgReqStats"; - this.pgReqStats.Size = new System.Drawing.Size(591, 227); + this.pgReqStats.Size = new System.Drawing.Size(734, 264); this.pgReqStats.TabIndex = 2; this.pgReqStats.Text = "Request Status"; this.pgReqStats.UseVisualStyleBackColor = true; // // ucRequestStatus // - this.ucRequestStatus.Location = new System.Drawing.Point(87, 41); + this.ucRequestStatus.Location = new System.Drawing.Point(110, 56); this.ucRequestStatus.Name = "ucRequestStatus"; - this.ucRequestStatus.Size = new System.Drawing.Size(416, 144); + this.ucRequestStatus.Size = new System.Drawing.Size(514, 152); this.ucRequestStatus.TabIndex = 0; // // txtOrganizer // - this.txtOrganizer.Location = new System.Drawing.Point(96, 72); + this.txtOrganizer.Location = new System.Drawing.Point(141, 83); this.txtOrganizer.Name = "txtOrganizer"; - this.txtOrganizer.Size = new System.Drawing.Size(437, 22); + this.txtOrganizer.Size = new System.Drawing.Size(572, 26); this.txtOrganizer.TabIndex = 6; // // label5 // - this.label5.Location = new System.Drawing.Point(18, 72); + this.label5.Location = new System.Drawing.Point(22, 83); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(72, 23); + this.label5.Size = new System.Drawing.Size(113, 23); this.label5.TabIndex = 5; this.label5.Text = "&Organizer"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtContact // - this.txtContact.Location = new System.Drawing.Point(96, 104); + this.txtContact.Location = new System.Drawing.Point(141, 115); this.txtContact.Name = "txtContact"; - this.txtContact.Size = new System.Drawing.Size(437, 22); + this.txtContact.Size = new System.Drawing.Size(572, 26); this.txtContact.TabIndex = 8; // // label6 // - this.label6.Location = new System.Drawing.Point(26, 104); + this.label6.Location = new System.Drawing.Point(22, 115); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(64, 23); + this.label6.Size = new System.Drawing.Size(113, 23); this.label6.TabIndex = 7; this.label6.Text = "Contact"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -294,7 +294,7 @@ private void InitializeComponent() // this.btnCancel.CausesValidation = false; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(523, 400); + this.btnCancel.Location = new System.Drawing.Point(666, 452); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(88, 32); this.btnCancel.TabIndex = 11; @@ -303,7 +303,7 @@ private void InitializeComponent() // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(12, 400); + this.btnOK.Location = new System.Drawing.Point(12, 452); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(88, 32); this.btnOK.TabIndex = 10; @@ -315,9 +315,9 @@ private void InitializeComponent() // // label7 // - this.label7.Location = new System.Drawing.Point(8, 40); + this.label7.Location = new System.Drawing.Point(18, 49); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(82, 23); + this.label7.Size = new System.Drawing.Size(117, 23); this.label7.TabIndex = 2; this.label7.Text = "&Time Zone"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -325,16 +325,16 @@ private void InitializeComponent() // cboTimeZone // this.cboTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboTimeZone.Location = new System.Drawing.Point(96, 40); + this.cboTimeZone.Location = new System.Drawing.Point(141, 49); this.cboTimeZone.MaxDropDownItems = 16; this.cboTimeZone.Name = "cboTimeZone"; - this.cboTimeZone.Size = new System.Drawing.Size(437, 24); + this.cboTimeZone.Size = new System.Drawing.Size(502, 28); this.cboTimeZone.TabIndex = 3; this.cboTimeZone.SelectedIndexChanged += new System.EventHandler(this.cboTimeZone_SelectedIndexChanged); // // btnApplyTZ // - this.btnApplyTZ.Location = new System.Drawing.Point(539, 38); + this.btnApplyTZ.Location = new System.Drawing.Point(649, 48); this.btnApplyTZ.Name = "btnApplyTZ"; this.btnApplyTZ.Size = new System.Drawing.Size(64, 28); this.btnApplyTZ.TabIndex = 4; @@ -345,7 +345,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnOK; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(623, 444); + this.ClientSize = new System.Drawing.Size(766, 496); this.Controls.Add(this.btnApplyTZ); this.Controls.Add(this.label7); this.Controls.Add(this.cboTimeZone); diff --git a/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.cs b/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.cs index 66a65a1..b07e02c 100644 --- a/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.cs +++ b/Source/CSharpDemos/CalendarBrowser/VFreeBusyDlg.cs @@ -2,7 +2,7 @@ // System : EWSoftware PDI Demonstration Applications // File : VFreeBusyDlg.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/29/2014 +// Updated : 11/24/2018 // Note : Copyright 2004-2014, Eric Woodruff, All rights reserved // Compiler: Visual C# // @@ -263,15 +263,13 @@ private void btnApplyTZ_Click(object sender, EventArgs e) /// The event parameters private void VFreeBusyDlg_Closing(object sender, CancelEventArgs e) { - Duration d; - // Ignore on cancel if(this.DialogResult == DialogResult.Cancel) return; epErrors.Clear(); - if(txtDuration.Text.Length != 0 && !Duration.TryParse(txtDuration.Text, out d)) + if(txtDuration.Text.Length != 0 && !Duration.TryParse(txtDuration.Text, out Duration d)) { epErrors.SetError(txtDuration, "Invalid duration value"); e.Cancel = true; diff --git a/Source/CSharpDemos/CalendarBrowser/VTimeZoneDlg.Designer.cs b/Source/CSharpDemos/CalendarBrowser/VTimeZoneDlg.Designer.cs index 5cef24b..e9987ce 100644 --- a/Source/CSharpDemos/CalendarBrowser/VTimeZoneDlg.Designer.cs +++ b/Source/CSharpDemos/CalendarBrowser/VTimeZoneDlg.Designer.cs @@ -47,7 +47,7 @@ private void InitializeComponent() // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(12, 493); + this.btnOK.Location = new System.Drawing.Point(12, 575); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(88, 32); this.btnOK.TabIndex = 7; @@ -57,7 +57,7 @@ private void InitializeComponent() // this.btnCancel.CausesValidation = false; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(502, 493); + this.btnCancel.Location = new System.Drawing.Point(652, 575); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(88, 32); this.btnCancel.TabIndex = 8; @@ -65,7 +65,7 @@ private void InitializeComponent() // // label1 // - this.label1.Location = new System.Drawing.Point(17, 12); + this.label1.Location = new System.Drawing.Point(38, 14); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(106, 23); this.label1.TabIndex = 0; @@ -74,41 +74,41 @@ private void InitializeComponent() // // txtTimeZoneId // - this.txtTimeZoneId.Location = new System.Drawing.Point(129, 12); + this.txtTimeZoneId.Location = new System.Drawing.Point(150, 12); this.txtTimeZoneId.Name = "txtTimeZoneId"; - this.txtTimeZoneId.Size = new System.Drawing.Size(448, 22); + this.txtTimeZoneId.Size = new System.Drawing.Size(570, 26); this.txtTimeZoneId.TabIndex = 1; // // txtTimeZoneUrl // - this.txtTimeZoneUrl.Location = new System.Drawing.Point(129, 40); + this.txtTimeZoneUrl.Location = new System.Drawing.Point(150, 44); this.txtTimeZoneUrl.Name = "txtTimeZoneUrl"; - this.txtTimeZoneUrl.Size = new System.Drawing.Size(448, 22); + this.txtTimeZoneUrl.Size = new System.Drawing.Size(570, 26); this.txtTimeZoneUrl.TabIndex = 3; // // label2 // - this.label2.Location = new System.Drawing.Point(9, 40); + this.label2.Location = new System.Drawing.Point(12, 46); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(114, 23); + this.label2.Size = new System.Drawing.Size(132, 23); this.label2.TabIndex = 2; this.label2.Text = "Time Zone &URL"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtLastModified // - this.txtLastModified.Location = new System.Drawing.Point(129, 72); + this.txtLastModified.Location = new System.Drawing.Point(150, 76); this.txtLastModified.Name = "txtLastModified"; this.txtLastModified.ReadOnly = true; - this.txtLastModified.Size = new System.Drawing.Size(168, 22); + this.txtLastModified.Size = new System.Drawing.Size(207, 26); this.txtLastModified.TabIndex = 5; this.txtLastModified.TabStop = false; // // label3 // - this.label3.Location = new System.Drawing.Point(19, 72); + this.label3.Location = new System.Drawing.Point(16, 78); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(104, 23); + this.label3.Size = new System.Drawing.Size(128, 23); this.label3.TabIndex = 4; this.label3.Text = "Last Modified"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -116,18 +116,18 @@ private void InitializeComponent() // grpObRules // this.grpObRules.Controls.Add(this.ucRules); - this.grpObRules.Location = new System.Drawing.Point(12, 104); + this.grpObRules.Location = new System.Drawing.Point(12, 121); this.grpObRules.Name = "grpObRules"; - this.grpObRules.Size = new System.Drawing.Size(578, 383); + this.grpObRules.Size = new System.Drawing.Size(728, 448); this.grpObRules.TabIndex = 6; this.grpObRules.TabStop = false; this.grpObRules.Text = "Observance Rules"; // // ucRules // - this.ucRules.Location = new System.Drawing.Point(5, 28); + this.ucRules.Location = new System.Drawing.Point(14, 28); this.ucRules.Name = "ucRules"; - this.ucRules.Size = new System.Drawing.Size(568, 344); + this.ucRules.Size = new System.Drawing.Size(700, 404); this.ucRules.TabIndex = 0; // // epErrors @@ -138,7 +138,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnOK; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(602, 537); + this.ClientSize = new System.Drawing.Size(752, 619); this.Controls.Add(this.grpObRules); this.Controls.Add(this.txtLastModified); this.Controls.Add(this.txtTimeZoneUrl); diff --git a/Source/CSharpDemos/PDIWebDemoCS/App_Code/AssemblyInfo.cs b/Source/CSharpDemos/PDIWebDemoCS/App_Code/AssemblyInfo.cs index 33015ed..05ebfa3 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/App_Code/AssemblyInfo.cs +++ b/Source/CSharpDemos/PDIWebDemoCS/App_Code/AssemblyInfo.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : AssemblyInfo.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 01/19/2015 -// Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // PDI Web Demo assembly attributes @@ -28,7 +28,7 @@ [assembly: AssemblyTitle("EWSoftware PDI Web Demo Application")] [assembly: AssemblyDescription("This is used to demonstrate the use of the PDI library classes in a web application")] [assembly: AssemblyCompany("Eric Woodruff")] -[assembly: AssemblyCopyright("Copyright \xA9 2003-2015, Eric Woodruff, All Rights Reserved")] +[assembly: AssemblyCopyright("Copyright \xA9 2003-2018, Eric Woodruff, All Rights Reserved")] [assembly: AssemblyCulture("")] #if DEBUG [assembly: AssemblyConfiguration("Debug")] @@ -52,5 +52,5 @@ // Day of release // Revision (typically zero unless multiple releases are made on the same day) // -[assembly: AssemblyVersion("2015.1.19.0")] -[assembly: AssemblyFileVersion("15.1.19.0")] +[assembly: AssemblyVersion("2018.11.22.0")] +[assembly: AssemblyFileVersion("18.11.22.0")] diff --git a/Source/CSharpDemos/PDIWebDemoCS/App_Code/Global.asax.cs b/Source/CSharpDemos/PDIWebDemoCS/App_Code/Global.asax.cs index df6334a..eef038f 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/App_Code/Global.asax.cs +++ b/Source/CSharpDemos/PDIWebDemoCS/App_Code/Global.asax.cs @@ -38,7 +38,7 @@ public class Global : System.Web.HttpApplication /// /// The sender of the event /// The event arguments - protected void Application_Start(Object sender, EventArgs e) + protected void Application_Start(object sender, EventArgs e) { // Load the time zones if not already done. The collection is static so it only needs to be loaded // once. @@ -84,7 +84,7 @@ protected void Application_Start(Object sender, EventArgs e) /// /// The sender of the event /// The event arguments - protected void Application_Error(Object sender, EventArgs e) + protected void Application_Error(object sender, EventArgs e) { // Nothing special yet. } diff --git a/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx b/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx index 81f2acc..9bb5582 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx +++ b/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx @@ -26,7 +26,7 @@ maximum of 1MB in this demo.

Select a file to upload -      diff --git a/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx.cs b/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx.cs index 16acb27..bb5e5bb 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx.cs +++ b/Source/CSharpDemos/PDIWebDemoCS/CalendarBrowser.aspx.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : CalendarBrowser.aspx.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This page is used to demonstrate the vCalendar/iCalendar classes @@ -91,7 +91,7 @@ protected void Page_Load(object sender, EventArgs e) /// /// The value to encode /// The value as an HTML-encoded string - protected string EncodeValue(object oValue) + protected static string EncodeValue(object oValue) { if(oValue != null) return HttpUtility.HtmlEncode(oValue.ToString()); @@ -424,7 +424,7 @@ protected void dgFreeBusys_DeleteCommand(object source, DataGridCommandEventArgs /// utilizing a comparison delegate. This example sorts the collection by the start date/time property /// and, if they are equal, the summary description. This is used to handle all of the collection /// types. - private int CalendarSorter(CalendarObject x, CalendarObject y) + private static int CalendarSorter(CalendarObject x, CalendarObject y) { DateTime d1, d2; string summary1, summary2; diff --git a/Source/CSharpDemos/PDIWebDemoCS/EventRecurTestForm.aspx.cs b/Source/CSharpDemos/PDIWebDemoCS/EventRecurTestForm.aspx.cs index 5018d90..252b4c3 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/EventRecurTestForm.aspx.cs +++ b/Source/CSharpDemos/PDIWebDemoCS/EventRecurTestForm.aspx.cs @@ -80,7 +80,7 @@ protected void Page_Load(object sender, EventArgs e) /// /// The recurring object /// The recurrence to check - private void ApplyLimits(RecurringObject ro, Recurrence r) + private static void ApplyLimits(RecurringObject ro, Recurrence r) { if(r.Frequency > RecurFrequency.Hourly) r.MaximumOccurrences = 5000; diff --git a/Source/CSharpDemos/PDIWebDemoCS/HolidayTestForm.aspx.cs b/Source/CSharpDemos/PDIWebDemoCS/HolidayTestForm.aspx.cs index 4f46a51..10a7a65 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/HolidayTestForm.aspx.cs +++ b/Source/CSharpDemos/PDIWebDemoCS/HolidayTestForm.aspx.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : HolidayTestForm.aspx.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/30/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This page is used to demonstrate the Holiday and date utility classes @@ -225,13 +225,14 @@ protected void dgHolidays_UpdateCommand(object source, DataGridCommandEventArgs // Create holiday object and replace it in the collection if(rbFloating.Checked) { - FloatingHoliday fl = new FloatingHoliday(); - - fl.Month = cboMonth.SelectedIndex + 1; - fl.Description = ((TextBox)e.Item.FindControl("txtDescription")).Text; - fl.Occurrence = (DayOccurrence)((DropDownList)e.Item.FindControl("cboOccurrence")).SelectedIndex + 1; - fl.Weekday = (System.DayOfWeek)((DropDownList)e.Item.FindControl("cboDayOfWeek")).SelectedIndex; - fl.Offset = Convert.ToInt32(((TextBox)e.Item.FindControl("txtOffset")).Text); + FloatingHoliday fl = new FloatingHoliday + { + Month = cboMonth.SelectedIndex + 1, + Description = ((TextBox)e.Item.FindControl("txtDescription")).Text, + Occurrence = (DayOccurrence)((DropDownList)e.Item.FindControl("cboOccurrence")).SelectedIndex + 1, + Weekday = (DayOfWeek)((DropDownList)e.Item.FindControl("cboDayOfWeek")).SelectedIndex, + Offset = Convert.ToInt32(((TextBox)e.Item.FindControl("txtOffset")).Text) + }; hc[e.Item.ItemIndex] = fl; } @@ -246,12 +247,13 @@ protected void dgHolidays_UpdateCommand(object source, DataGridCommandEventArgs return; } - FixedHoliday fx = new FixedHoliday(); - - fx.Month = cboMonth.SelectedIndex + 1; - fx.Description = ((TextBox)e.Item.FindControl("txtDescription")).Text; - fx.AdjustFixedDate = ((CheckBox)e.Item.FindControl("chkAdjustDate")).Checked; - fx.Day = Convert.ToInt32(((TextBox)e.Item.FindControl("txtDayOfMonth")).Text); + FixedHoliday fx = new FixedHoliday + { + Month = cboMonth.SelectedIndex + 1, + Description = ((TextBox)e.Item.FindControl("txtDescription")).Text, + AdjustFixedDate = ((CheckBox)e.Item.FindControl("chkAdjustDate")).Checked, + Day = Convert.ToInt32(((TextBox)e.Item.FindControl("txtDayOfMonth")).Text) + }; hc[e.Item.ItemIndex] = fx; } diff --git a/Source/CSharpDemos/PDIWebDemoCS/PDIWebDemoCS.vsspell b/Source/CSharpDemos/PDIWebDemoCS/PDIWebDemoCS.vsspell new file mode 100644 index 0000000..bf95e47 --- /dev/null +++ b/Source/CSharpDemos/PDIWebDemoCS/PDIWebDemoCS.vsspell @@ -0,0 +1,17 @@ + + + + True + + True + + True + True + True + True + + navbar + Dest + + \ No newline at end of file diff --git a/Source/CSharpDemos/PDIWebDemoCS/RFC2426.vcf b/Source/CSharpDemos/PDIWebDemoCS/RFC2426.vcf index 942adda..25d6572 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/RFC2426.vcf +++ b/Source/CSharpDemos/PDIWebDemoCS/RFC2426.vcf @@ -318,7 +318,9 @@ NOTE:Just a little test note URL:http://www.ewoodruff.us TZ;VALUE=TEXT:(GMT-08:00) Pacific Time (US & Canada)\; Tijuana GEO:47.551324;-117.644544 -REV:2005-01-24T22:47:38Z +REV:2018-11-22T22:39:31Z UID:687DF7A7-8168-4BD8-928C-5665B6AEED74 -LOGO;VALUE=URI;TYPE=PNG:https://github.com/EWSoftware/PDI/blob/master/NuGet/EWSPDI.png +PHOTO;VALUE=URI;TYPE=JPEG:http://www.EWoodruff.us/Images/Avatar.jpg +LOGO;VALUE=URI;TYPE=PNG:https://raw.githubusercontent.com/EWSoftware/PDI/ma + ster/EWSPDI.png END:VCARD diff --git a/Source/CSharpDemos/PDIWebDemoCS/RRuleTestForm.aspx.cs b/Source/CSharpDemos/PDIWebDemoCS/RRuleTestForm.aspx.cs index 33273cc..0917b96 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/RRuleTestForm.aspx.cs +++ b/Source/CSharpDemos/PDIWebDemoCS/RRuleTestForm.aspx.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : RRuleTestForm.aspx.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This page is used to demonstrate the recurrence engine @@ -92,8 +92,7 @@ protected void btnTest_Click(object sender, EventArgs e) } // Define the recurrence rule by parsing the text - Recurrence r = new Recurrence(txtRRULE.Text); - r.StartDateTime = dt; + Recurrence r = new Recurrence(txtRRULE.Text) { StartDateTime = dt }; // Synch the pattern control to the RRULE if not called by the pattern's test button if(sender != btnTestPattern) diff --git a/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx b/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx index 2d7e154..d274451 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx +++ b/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx @@ -26,7 +26,7 @@ demo.

Select a file to upload -      diff --git a/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx.cs b/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx.cs index 771b60a..78b1630 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx.cs +++ b/Source/CSharpDemos/PDIWebDemoCS/VCardBrowser.aspx.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : VCardBrowser.aspx.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This page is used to demonstrate the vCard classes @@ -69,7 +69,7 @@ protected void Page_Load(object sender, EventArgs e) /// /// The value to encode /// The value as an HTML-encoded string - protected string EncodeValue(object oValue) + protected static string EncodeValue(object oValue) { if(oValue != null) return HttpUtility.HtmlEncode(oValue.ToString()); @@ -236,7 +236,7 @@ protected void dgVCards_DeleteCommand(object source, DataGridCommandEventArgs e) /// Due to the variety of properties in a vCard, sorting is left up to the developer utilizing a /// comparison delegate. This example sorts the collection by the name property taking into account the /// SortStringProperty if set. - private int VCardSorter(VCard x, VCard y) + private static int VCardSorter(VCard x, VCard y) { string sortName1, sortName2; diff --git a/Source/CSharpDemos/PDIWebDemoCS/Web.config b/Source/CSharpDemos/PDIWebDemoCS/Web.config index b08f825..df81a68 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/Web.config +++ b/Source/CSharpDemos/PDIWebDemoCS/Web.config @@ -24,7 +24,7 @@ - + diff --git a/Source/CSharpDemos/PDIWebDemoCS/vwd.webinfo b/Source/CSharpDemos/PDIWebDemoCS/vwd.webinfo index dccbd2e..05649b7 100644 --- a/Source/CSharpDemos/PDIWebDemoCS/vwd.webinfo +++ b/Source/CSharpDemos/PDIWebDemoCS/vwd.webinfo @@ -189,6 +189,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.Designer.cs b/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.Designer.cs index 95b0ed1..14ee9a1 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.Designer.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.Designer.cs @@ -47,9 +47,9 @@ private void InitializeComponent() // // lnkHelp // - this.lnkHelp.Location = new System.Drawing.Point(168, 301); + this.lnkHelp.Location = new System.Drawing.Point(187, 334); this.lnkHelp.Name = "lnkHelp"; - this.lnkHelp.Size = new System.Drawing.Size(144, 18); + this.lnkHelp.Size = new System.Drawing.Size(216, 23); this.lnkHelp.TabIndex = 6; this.lnkHelp.TabStop = true; this.lnkHelp.Text = "Eric@EWoodruff.us"; @@ -58,13 +58,13 @@ private void InitializeComponent() // ColumnHeader1 // this.ColumnHeader1.Text = "Name"; - this.ColumnHeader1.Width = 250; + this.ColumnHeader1.Width = 275; // // btnSysInfo // - this.btnSysInfo.Location = new System.Drawing.Point(334, 349); + this.btnSysInfo.Location = new System.Drawing.Point(355, 398); this.btnSysInfo.Name = "btnSysInfo"; - this.btnSysInfo.Size = new System.Drawing.Size(112, 32); + this.btnSysInfo.Size = new System.Drawing.Size(150, 32); this.btnSysInfo.TabIndex = 9; this.btnSysInfo.Text = "System Info..."; this.btnSysInfo.Click += new System.EventHandler(this.btnSysInfo_Click); @@ -72,9 +72,9 @@ private void InitializeComponent() // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(216, 349); + this.btnOK.Location = new System.Drawing.Point(199, 398); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(112, 32); + this.btnOK.Size = new System.Drawing.Size(150, 32); this.btnOK.TabIndex = 8; this.btnOK.Text = "OK"; // @@ -86,10 +86,10 @@ private void InitializeComponent() this.lvComponents.FullRowSelect = true; this.lvComponents.GridLines = true; this.lvComponents.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.lvComponents.Location = new System.Drawing.Point(12, 128); + this.lvComponents.Location = new System.Drawing.Point(12, 153); this.lvComponents.MultiSelect = false; this.lvComponents.Name = "lvComponents"; - this.lvComponents.Size = new System.Drawing.Size(434, 170); + this.lvComponents.Size = new System.Drawing.Size(493, 170); this.lvComponents.TabIndex = 4; this.lvComponents.UseCompatibleStateImageBehavior = false; this.lvComponents.View = System.Windows.Forms.View.Details; @@ -101,9 +101,9 @@ private void InitializeComponent() // // Label1 // - this.Label1.Location = new System.Drawing.Point(12, 106); + this.Label1.Location = new System.Drawing.Point(8, 127); this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(164, 19); + this.Label1.Size = new System.Drawing.Size(164, 23); this.Label1.TabIndex = 3; this.Label1.Text = "Product Components"; // @@ -111,23 +111,23 @@ private void InitializeComponent() // this.lblName.Location = new System.Drawing.Point(80, 8); this.lblName.Name = "lblName"; - this.lblName.Size = new System.Drawing.Size(366, 19); + this.lblName.Size = new System.Drawing.Size(425, 23); this.lblName.TabIndex = 0; this.lblName.Text = ""; // // lblDescription // - this.lblDescription.Location = new System.Drawing.Point(80, 56); + this.lblDescription.Location = new System.Drawing.Point(80, 64); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(366, 40); + this.lblDescription.Size = new System.Drawing.Size(425, 67); this.lblDescription.TabIndex = 2; this.lblDescription.Text = ""; // // lblCopyright // - this.lblCopyright.Location = new System.Drawing.Point(12, 327); + this.lblCopyright.Location = new System.Drawing.Point(12, 364); this.lblCopyright.Name = "lblCopyright"; - this.lblCopyright.Size = new System.Drawing.Size(434, 19); + this.lblCopyright.Size = new System.Drawing.Size(493, 23); this.lblCopyright.TabIndex = 7; this.lblCopyright.Text = ""; // @@ -143,17 +143,17 @@ private void InitializeComponent() // // lblVersion // - this.lblVersion.Location = new System.Drawing.Point(80, 32); + this.lblVersion.Location = new System.Drawing.Point(80, 36); this.lblVersion.Name = "lblVersion"; - this.lblVersion.Size = new System.Drawing.Size(366, 19); + this.lblVersion.Size = new System.Drawing.Size(425, 23); this.lblVersion.TabIndex = 1; this.lblVersion.Text = ""; // // label2 // - this.label2.Location = new System.Drawing.Point(12, 301); + this.label2.Location = new System.Drawing.Point(12, 334); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(162, 19); + this.label2.Size = new System.Drawing.Size(178, 23); this.label2.TabIndex = 5; this.label2.Text = "For help send e-mail to"; // @@ -161,7 +161,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnOK; this.CancelButton = this.btnOK; - this.ClientSize = new System.Drawing.Size(458, 393); + this.ClientSize = new System.Drawing.Size(517, 442); this.Controls.Add(this.lnkHelp); this.Controls.Add(this.label2); this.Controls.Add(this.btnSysInfo); diff --git a/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.cs b/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.cs index 5cc7c2d..83c01ca 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/AboutDlg.cs @@ -1,8 +1,8 @@ //=============================================================================================================== // File : AboutDlg.cs // Author : Eric Woodruff -// Updated : 12/27/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This form is used to display application version information @@ -17,6 +17,8 @@ // 11/10/2003 EFW Created the code //=============================================================================================================== +// Ignore Spelling: mailto + using System; using System.Reflection; using System.Windows.Forms; diff --git a/Source/CSharpDemos/PDIWinFormsTest/EventRecurTestForm.Designer.cs b/Source/CSharpDemos/PDIWinFormsTest/EventRecurTestForm.Designer.cs index 83168c3..3ada564 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/EventRecurTestForm.Designer.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/EventRecurTestForm.Designer.cs @@ -46,9 +46,9 @@ private void InitializeComponent() // // label3 // - this.label3.Location = new System.Drawing.Point(12, 88); + this.label3.Location = new System.Drawing.Point(14, 118); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(372, 24); + this.label3.Size = new System.Drawing.Size(417, 23); this.label3.TabIndex = 7; this.label3.Text = "&Enter a VEVENT, VTODO, or VJOURNAL entry below."; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -59,11 +59,11 @@ private void InitializeComponent() this.txtCalendar.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtCalendar.Location = new System.Drawing.Point(12, 115); + this.txtCalendar.Location = new System.Drawing.Point(18, 145); this.txtCalendar.Multiline = true; this.txtCalendar.Name = "txtCalendar"; this.txtCalendar.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtCalendar.Size = new System.Drawing.Size(371, 414); + this.txtCalendar.Size = new System.Drawing.Size(413, 379); this.txtCalendar.TabIndex = 8; this.txtCalendar.WordWrap = false; // @@ -71,7 +71,7 @@ private void InitializeComponent() // this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnClose.Location = new System.Drawing.Point(757, 491); + this.btnClose.Location = new System.Drawing.Point(878, 530); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(88, 32); this.btnClose.TabIndex = 12; @@ -81,16 +81,17 @@ private void InitializeComponent() // this.lbDates.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.lbDates.ItemHeight = 16; - this.lbDates.Location = new System.Drawing.Point(389, 128); + this.lbDates.HorizontalScrollbar = true; + this.lbDates.ItemHeight = 20; + this.lbDates.Location = new System.Drawing.Point(437, 177); this.lbDates.Name = "lbDates"; - this.lbDates.Size = new System.Drawing.Size(456, 356); + this.lbDates.Size = new System.Drawing.Size(529, 344); this.lbDates.TabIndex = 10; // // btnTest // this.btnTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnTest.Location = new System.Drawing.Point(663, 491); + this.btnTest.Location = new System.Drawing.Point(784, 530); this.btnTest.Name = "btnTest"; this.btnTest.Size = new System.Drawing.Size(88, 32); this.btnTest.TabIndex = 11; @@ -99,47 +100,47 @@ private void InitializeComponent() // // dtpStartDate // + this.dtpStartDate.Checked = false; this.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStartDate.Location = new System.Drawing.Point(184, 8); + this.dtpStartDate.Location = new System.Drawing.Point(329, 12); this.dtpStartDate.Name = "dtpStartDate"; - this.dtpStartDate.Size = new System.Drawing.Size(190, 22); + this.dtpStartDate.Size = new System.Drawing.Size(235, 26); this.dtpStartDate.TabIndex = 1; - this.dtpStartDate.Value = new System.DateTime(2004, 9, 6, 0, 0, 0, 0); // // label1 // - this.label1.Location = new System.Drawing.Point(14, 8); + this.label1.Location = new System.Drawing.Point(124, 12); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(164, 23); + this.label1.Size = new System.Drawing.Size(199, 23); this.label1.TabIndex = 0; this.label1.Text = "&Find instances between"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // dtpEndDate // + this.dtpEndDate.Checked = false; this.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEndDate.Location = new System.Drawing.Point(418, 8); + this.dtpEndDate.Location = new System.Drawing.Point(627, 12); this.dtpEndDate.Name = "dtpEndDate"; - this.dtpEndDate.Size = new System.Drawing.Size(190, 22); + this.dtpEndDate.Size = new System.Drawing.Size(235, 26); this.dtpEndDate.TabIndex = 3; - this.dtpEndDate.Value = new System.DateTime(2004, 9, 6, 0, 0, 0, 0); // // label2 // - this.label2.Location = new System.Drawing.Point(380, 8); + this.label2.Location = new System.Drawing.Point(570, 12); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(32, 23); + this.label2.Size = new System.Drawing.Size(51, 23); this.label2.TabIndex = 2; this.label2.Text = "and"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label6 // - this.label6.Location = new System.Drawing.Point(12, 40); + this.label6.Location = new System.Drawing.Point(10, 76); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(262, 23); + this.label6.Size = new System.Drawing.Size(313, 23); this.label6.TabIndex = 5; this.label6.Text = "&Apply this time zone to the component"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -149,19 +150,17 @@ private void InitializeComponent() this.cboTimeZone.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.cboTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboTimeZone.Location = new System.Drawing.Point(280, 40); + this.cboTimeZone.Location = new System.Drawing.Point(329, 74); this.cboTimeZone.MaxDropDownItems = 16; this.cboTimeZone.Name = "cboTimeZone"; - this.cboTimeZone.Size = new System.Drawing.Size(447, 24); + this.cboTimeZone.Size = new System.Drawing.Size(568, 28); this.cboTimeZone.TabIndex = 6; // // chkInLocalTime // - this.chkInLocalTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.chkInLocalTime.Location = new System.Drawing.Point(622, 8); + this.chkInLocalTime.Location = new System.Drawing.Point(329, 44); this.chkInLocalTime.Name = "chkInLocalTime"; - this.chkInLocalTime.Size = new System.Drawing.Size(210, 24); + this.chkInLocalTime.Size = new System.Drawing.Size(310, 24); this.chkInLocalTime.TabIndex = 4; this.chkInLocalTime.Text = "Find instances in local time"; // @@ -169,17 +168,17 @@ private void InitializeComponent() // this.lblCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lblCount.Location = new System.Drawing.Point(389, 67); + this.lblCount.Location = new System.Drawing.Point(437, 118); this.lblCount.Name = "lblCount"; - this.lblCount.Size = new System.Drawing.Size(454, 56); - this.lblCount.TabIndex = 13; + this.lblCount.Size = new System.Drawing.Size(529, 56); + this.lblCount.TabIndex = 9; this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // EventRecurTestForm // this.AcceptButton = this.btnTest; this.CancelButton = this.btnClose; - this.ClientSize = new System.Drawing.Size(857, 535); + this.ClientSize = new System.Drawing.Size(978, 574); this.Controls.Add(this.lblCount); this.Controls.Add(this.chkInLocalTime); this.Controls.Add(this.label6); @@ -195,7 +194,7 @@ private void InitializeComponent() this.Controls.Add(this.label3); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(865, 575); + this.MinimumSize = new System.Drawing.Size(1000, 575); this.Name = "EventRecurTestForm"; this.ShowInTaskbar = false; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; diff --git a/Source/CSharpDemos/PDIWinFormsTest/HolidayTestForm.Designer.cs b/Source/CSharpDemos/PDIWinFormsTest/HolidayTestForm.Designer.cs index 3534176..ee813c7 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/HolidayTestForm.Designer.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/HolidayTestForm.Designer.cs @@ -61,7 +61,7 @@ private void InitializeComponent() // btnClose // this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnClose.Location = new System.Drawing.Point(724, 381); + this.btnClose.Location = new System.Drawing.Point(851, 391); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(88, 32); this.btnClose.TabIndex = 2; @@ -72,7 +72,7 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.hmHolidays); this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(286, 401); + this.groupBox1.Size = new System.Drawing.Size(348, 401); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "H&olidays"; @@ -81,7 +81,7 @@ private void InitializeComponent() // this.hmHolidays.Location = new System.Drawing.Point(8, 24); this.hmHolidays.Name = "hmHolidays"; - this.hmHolidays.Size = new System.Drawing.Size(272, 368); + this.hmHolidays.Size = new System.Drawing.Size(334, 368); this.hmHolidays.TabIndex = 0; // // groupBox2 @@ -97,9 +97,9 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.label1); this.groupBox2.Controls.Add(this.btnTestDate); this.groupBox2.Controls.Add(this.label3); - this.groupBox2.Location = new System.Drawing.Point(304, 12); + this.groupBox2.Location = new System.Drawing.Point(366, 12); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(508, 363); + this.groupBox2.Size = new System.Drawing.Size(573, 373); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "Test Date Detection"; @@ -136,7 +136,7 @@ private void InitializeComponent() this.dgvDatesFound.RowHeadersVisible = false; this.dgvDatesFound.RowTemplate.Height = 24; this.dgvDatesFound.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvDatesFound.Size = new System.Drawing.Size(337, 298); + this.dgvDatesFound.Size = new System.Drawing.Size(372, 298); this.dgvDatesFound.TabIndex = 10; // // tbcDate @@ -153,19 +153,19 @@ private void InitializeComponent() this.tbcDescription.HeaderText = "Description"; this.tbcDescription.Name = "tbcDescription"; this.tbcDescription.ReadOnly = true; - this.tbcDescription.Width = 210; + this.tbcDescription.Width = 230; // // dtpTestDate // this.dtpTestDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dtpTestDate.Location = new System.Drawing.Point(96, 331); + this.dtpTestDate.Location = new System.Drawing.Point(100, 335); this.dtpTestDate.Name = "dtpTestDate"; - this.dtpTestDate.Size = new System.Drawing.Size(110, 22); + this.dtpTestDate.Size = new System.Drawing.Size(135, 26); this.dtpTestDate.TabIndex = 8; // // udcToYear // - this.udcToYear.Location = new System.Drawing.Point(439, 64); + this.udcToYear.Location = new System.Drawing.Point(490, 47); this.udcToYear.Maximum = new decimal(new int[] { 9999, 0, @@ -177,18 +177,18 @@ private void InitializeComponent() 0, 0}); this.udcToYear.Name = "udcToYear"; - this.udcToYear.Size = new System.Drawing.Size(56, 22); + this.udcToYear.Size = new System.Drawing.Size(75, 26); this.udcToYear.TabIndex = 3; this.udcToYear.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.udcToYear.Value = new decimal(new int[] { - 2004, + 2023, 0, 0, 0}); // // udcFromYear // - this.udcFromYear.Location = new System.Drawing.Point(349, 64); + this.udcFromYear.Location = new System.Drawing.Point(391, 47); this.udcFromYear.Maximum = new decimal(new int[] { 9999, 0, @@ -200,11 +200,11 @@ private void InitializeComponent() 0, 0}); this.udcFromYear.Name = "udcFromYear"; - this.udcFromYear.Size = new System.Drawing.Size(56, 22); + this.udcFromYear.Size = new System.Drawing.Size(75, 26); this.udcFromYear.TabIndex = 1; this.udcFromYear.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.udcFromYear.Value = new decimal(new int[] { - 2000, + 2017, 0, 0, 0}); @@ -214,9 +214,9 @@ private void InitializeComponent() this.grpEaster.Controls.Add(this.rbGregorian); this.grpEaster.Controls.Add(this.rbOrthodox); this.grpEaster.Controls.Add(this.rbJulian); - this.grpEaster.Location = new System.Drawing.Point(349, 92); + this.grpEaster.Location = new System.Drawing.Point(391, 87); this.grpEaster.Name = "grpEaster"; - this.grpEaster.Size = new System.Drawing.Size(144, 120); + this.grpEaster.Size = new System.Drawing.Size(165, 134); this.grpEaster.TabIndex = 4; this.grpEaster.TabStop = false; this.grpEaster.Text = "Easter Method"; @@ -224,75 +224,75 @@ private void InitializeComponent() // rbGregorian // this.rbGregorian.Checked = true; - this.rbGregorian.Location = new System.Drawing.Point(24, 88); + this.rbGregorian.Location = new System.Drawing.Point(25, 94); this.rbGregorian.Name = "rbGregorian"; - this.rbGregorian.Size = new System.Drawing.Size(104, 24); + this.rbGregorian.Size = new System.Drawing.Size(115, 24); this.rbGregorian.TabIndex = 2; this.rbGregorian.TabStop = true; this.rbGregorian.Text = "Gregorian"; // // rbOrthodox // - this.rbOrthodox.Location = new System.Drawing.Point(24, 56); + this.rbOrthodox.Location = new System.Drawing.Point(25, 64); this.rbOrthodox.Name = "rbOrthodox"; - this.rbOrthodox.Size = new System.Drawing.Size(104, 24); + this.rbOrthodox.Size = new System.Drawing.Size(115, 24); this.rbOrthodox.TabIndex = 1; this.rbOrthodox.Text = "Orthodox"; // // rbJulian // - this.rbJulian.Location = new System.Drawing.Point(24, 24); + this.rbJulian.Location = new System.Drawing.Point(25, 34); this.rbJulian.Name = "rbJulian"; - this.rbJulian.Size = new System.Drawing.Size(104, 24); + this.rbJulian.Size = new System.Drawing.Size(115, 24); this.rbJulian.TabIndex = 0; this.rbJulian.Text = "Julian"; // // btnEaster // - this.btnEaster.Location = new System.Drawing.Point(352, 280); + this.btnEaster.Location = new System.Drawing.Point(391, 287); this.btnEaster.Name = "btnEaster"; - this.btnEaster.Size = new System.Drawing.Size(136, 32); + this.btnEaster.Size = new System.Drawing.Size(140, 32); this.btnEaster.TabIndex = 6; this.btnEaster.Text = "Find Ea&ster"; this.btnEaster.Click += new System.EventHandler(this.btnEaster_Click); // // btnFind // - this.btnFind.Location = new System.Drawing.Point(352, 232); + this.btnFind.Location = new System.Drawing.Point(391, 241); this.btnFind.Name = "btnFind"; - this.btnFind.Size = new System.Drawing.Size(136, 32); + this.btnFind.Size = new System.Drawing.Size(140, 32); this.btnFind.TabIndex = 5; this.btnFind.Text = "&Find Holidays"; this.btnFind.Click += new System.EventHandler(this.btnFind_Click); // // label2 // - this.label2.Location = new System.Drawing.Point(439, 40); + this.label2.Location = new System.Drawing.Point(490, 21); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(62, 23); + this.label2.Size = new System.Drawing.Size(75, 23); this.label2.TabIndex = 2; this.label2.Text = "To Year"; // // label1 // - this.label1.Location = new System.Drawing.Point(349, 40); + this.label1.Location = new System.Drawing.Point(391, 21); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(84, 23); + this.label1.Size = new System.Drawing.Size(93, 23); this.label1.TabIndex = 0; this.label1.Text = "Fro&m Year"; // // btnTestDate // - this.btnTestDate.Location = new System.Drawing.Point(212, 325); + this.btnTestDate.Location = new System.Drawing.Point(241, 332); this.btnTestDate.Name = "btnTestDate"; - this.btnTestDate.Size = new System.Drawing.Size(88, 32); + this.btnTestDate.Size = new System.Drawing.Size(137, 32); this.btnTestDate.TabIndex = 9; this.btnTestDate.Text = "&Holiday?"; this.btnTestDate.Click += new System.EventHandler(this.btnTestDate_Click); // // label3 // - this.label3.Location = new System.Drawing.Point(6, 330); + this.label3.Location = new System.Drawing.Point(10, 337); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(84, 23); this.label3.TabIndex = 7; @@ -302,7 +302,7 @@ private void InitializeComponent() // HolidayTestForm // this.CancelButton = this.btnClose; - this.ClientSize = new System.Drawing.Size(824, 425); + this.ClientSize = new System.Drawing.Size(951, 435); this.Controls.Add(this.btnClose); this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox2); diff --git a/Source/CSharpDemos/PDIWinFormsTest/MainForm.Designer.cs b/Source/CSharpDemos/PDIWinFormsTest/MainForm.Designer.cs index 5deb0f7..2a4762f 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/MainForm.Designer.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/MainForm.Designer.cs @@ -41,9 +41,9 @@ private void InitializeComponent() // // btnHolidays // - this.btnHolidays.Location = new System.Drawing.Point(84, 18); + this.btnHolidays.Location = new System.Drawing.Point(184, 18); this.btnHolidays.Name = "btnHolidays"; - this.btnHolidays.Size = new System.Drawing.Size(138, 40); + this.btnHolidays.Size = new System.Drawing.Size(160, 40); this.btnHolidays.TabIndex = 0; this.btnHolidays.Text = "Test &Holidays"; this.toolTip1.SetToolTip(this.btnHolidays, "Test holiday generation classes"); @@ -51,9 +51,9 @@ private void InitializeComponent() // // btnExit // - this.btnExit.Location = new System.Drawing.Point(84, 293); + this.btnExit.Location = new System.Drawing.Point(184, 293); this.btnExit.Name = "btnExit"; - this.btnExit.Size = new System.Drawing.Size(138, 40); + this.btnExit.Size = new System.Drawing.Size(160, 40); this.btnExit.TabIndex = 5; this.btnExit.Text = "E&xit"; this.toolTip1.SetToolTip(this.btnExit, "Exit the application"); @@ -61,9 +61,9 @@ private void InitializeComponent() // // btnRRULE // - this.btnRRULE.Location = new System.Drawing.Point(84, 73); + this.btnRRULE.Location = new System.Drawing.Point(184, 73); this.btnRRULE.Name = "btnRRULE"; - this.btnRRULE.Size = new System.Drawing.Size(138, 40); + this.btnRRULE.Size = new System.Drawing.Size(160, 40); this.btnRRULE.TabIndex = 1; this.btnRRULE.Text = "Test RR&ULE"; this.toolTip1.SetToolTip(this.btnRRULE, "Test the recurrence class"); @@ -71,9 +71,9 @@ private void InitializeComponent() // // btnTestCalRecur // - this.btnTestCalRecur.Location = new System.Drawing.Point(84, 128); + this.btnTestCalRecur.Location = new System.Drawing.Point(184, 128); this.btnTestCalRecur.Name = "btnTestCalRecur"; - this.btnTestCalRecur.Size = new System.Drawing.Size(138, 40); + this.btnTestCalRecur.Size = new System.Drawing.Size(160, 40); this.btnTestCalRecur.TabIndex = 2; this.btnTestCalRecur.Text = "Test C&al Recur"; this.toolTip1.SetToolTip(this.btnTestCalRecur, "Test iCalendar recurrence"); @@ -81,9 +81,9 @@ private void InitializeComponent() // // btnTestVTimeZone // - this.btnTestVTimeZone.Location = new System.Drawing.Point(84, 183); + this.btnTestVTimeZone.Location = new System.Drawing.Point(184, 183); this.btnTestVTimeZone.Name = "btnTestVTimeZone"; - this.btnTestVTimeZone.Size = new System.Drawing.Size(138, 40); + this.btnTestVTimeZone.Size = new System.Drawing.Size(160, 40); this.btnTestVTimeZone.TabIndex = 3; this.btnTestVTimeZone.Text = "Test &VTimeZone"; this.toolTip1.SetToolTip(this.btnTestVTimeZone, "Test the VTIMEZONE classes"); @@ -91,9 +91,9 @@ private void InitializeComponent() // // btnAbout // - this.btnAbout.Location = new System.Drawing.Point(84, 238); + this.btnAbout.Location = new System.Drawing.Point(184, 238); this.btnAbout.Name = "btnAbout"; - this.btnAbout.Size = new System.Drawing.Size(138, 40); + this.btnAbout.Size = new System.Drawing.Size(160, 40); this.btnAbout.TabIndex = 4; this.btnAbout.Text = "A&bout"; this.toolTip1.SetToolTip(this.btnAbout, "View application copyright and version information"); @@ -101,7 +101,7 @@ private void InitializeComponent() // // MainForm // - this.ClientSize = new System.Drawing.Size(307, 353); + this.ClientSize = new System.Drawing.Size(528, 353); this.Controls.Add(this.btnAbout); this.Controls.Add(this.btnTestVTimeZone); this.Controls.Add(this.btnTestCalRecur); diff --git a/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.Designer.cs b/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.Designer.cs index bec6e16..8df7d24 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.Designer.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.Designer.cs @@ -46,9 +46,9 @@ private void InitializeComponent() // // label3 // - this.label3.Location = new System.Drawing.Point(14, 41); + this.label3.Location = new System.Drawing.Point(14, 46); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 23); + this.label3.Size = new System.Drawing.Size(77, 23); this.label3.TabIndex = 2; this.label3.Text = "RR&ULE"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -57,11 +57,11 @@ private void InitializeComponent() // this.txtRRULE.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtRRULE.Location = new System.Drawing.Point(76, 41); + this.txtRRULE.Location = new System.Drawing.Point(97, 44); this.txtRRULE.Multiline = true; this.txtRRULE.Name = "txtRRULE"; this.txtRRULE.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtRRULE.Size = new System.Drawing.Size(590, 64); + this.txtRRULE.Size = new System.Drawing.Size(668, 64); this.txtRRULE.TabIndex = 3; this.txtRRULE.Text = "FREQ=DAILY;INTERVAL=5;COUNT=50"; // @@ -69,7 +69,7 @@ private void InitializeComponent() // this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnClose.Location = new System.Drawing.Point(674, 456); + this.btnClose.Location = new System.Drawing.Point(778, 456); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(88, 32); this.btnClose.TabIndex = 10; @@ -80,16 +80,17 @@ private void InitializeComponent() this.lbDates.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.lbDates.FormattingEnabled = true; - this.lbDates.ItemHeight = 16; - this.lbDates.Location = new System.Drawing.Point(12, 169); + this.lbDates.IntegralHeight = false; + this.lbDates.ItemHeight = 20; + this.lbDates.Location = new System.Drawing.Point(12, 183); this.lbDates.Name = "lbDates"; - this.lbDates.Size = new System.Drawing.Size(386, 276); + this.lbDates.Size = new System.Drawing.Size(386, 250); this.lbDates.TabIndex = 7; // // btnTest // this.btnTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnTest.Location = new System.Drawing.Point(580, 456); + this.btnTest.Location = new System.Drawing.Point(684, 456); this.btnTest.Name = "btnTest"; this.btnTest.Size = new System.Drawing.Size(88, 32); this.btnTest.TabIndex = 9; @@ -98,19 +99,19 @@ private void InitializeComponent() // // dtpStartDate // + this.dtpStartDate.Checked = false; this.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStartDate.Location = new System.Drawing.Point(76, 12); + this.dtpStartDate.Location = new System.Drawing.Point(97, 12); this.dtpStartDate.Name = "dtpStartDate"; - this.dtpStartDate.Size = new System.Drawing.Size(190, 22); + this.dtpStartDate.Size = new System.Drawing.Size(235, 26); this.dtpStartDate.TabIndex = 1; - this.dtpStartDate.Value = new System.DateTime(2004, 9, 6, 0, 0, 0, 0); // // label1 // - this.label1.Location = new System.Drawing.Point(21, 12); + this.label1.Location = new System.Drawing.Point(21, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(49, 23); + this.label1.Size = new System.Drawing.Size(70, 23); this.label1.TabIndex = 0; this.label1.Text = "&Start"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -120,9 +121,9 @@ private void InitializeComponent() this.lblCount.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lblCount.Location = new System.Drawing.Point(12, 112); + this.lblCount.Location = new System.Drawing.Point(12, 119); this.lblCount.Name = "lblCount"; - this.lblCount.Size = new System.Drawing.Size(750, 48); + this.lblCount.Size = new System.Drawing.Size(854, 48); this.lblCount.TabIndex = 6; this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -134,15 +135,15 @@ private void InitializeComponent() this.hmHolidays.Location = new System.Drawing.Point(8, 24); this.hmHolidays.Name = "hmHolidays"; this.hmHolidays.ShowLoadSaveControls = false; - this.hmHolidays.Size = new System.Drawing.Size(342, 256); + this.hmHolidays.Size = new System.Drawing.Size(446, 243); this.hmHolidays.TabIndex = 0; // // btnDesign // this.btnDesign.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDesign.Location = new System.Drawing.Point(674, 38); + this.btnDesign.Location = new System.Drawing.Point(771, 41); this.btnDesign.Name = "btnDesign"; - this.btnDesign.Size = new System.Drawing.Size(88, 32); + this.btnDesign.Size = new System.Drawing.Size(95, 32); this.btnDesign.TabIndex = 4; this.btnDesign.Text = "Desig&n"; this.btnDesign.Click += new System.EventHandler(this.btnDesign_Click); @@ -153,9 +154,9 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Controls.Add(this.hmHolidays); - this.groupBox1.Location = new System.Drawing.Point(404, 157); + this.groupBox1.Location = new System.Drawing.Point(404, 170); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(358, 288); + this.groupBox1.Size = new System.Drawing.Size(462, 275); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "H&olidays"; @@ -163,9 +164,9 @@ private void InitializeComponent() // btnDescribe // this.btnDescribe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDescribe.Location = new System.Drawing.Point(674, 76); + this.btnDescribe.Location = new System.Drawing.Point(771, 79); this.btnDescribe.Name = "btnDescribe"; - this.btnDescribe.Size = new System.Drawing.Size(88, 32); + this.btnDescribe.Size = new System.Drawing.Size(95, 32); this.btnDescribe.TabIndex = 5; this.btnDescribe.Text = "Descri&be"; this.btnDescribe.Click += new System.EventHandler(this.btnDescribe_Click); @@ -174,7 +175,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnTest; this.CancelButton = this.btnClose; - this.ClientSize = new System.Drawing.Size(774, 500); + this.ClientSize = new System.Drawing.Size(878, 500); this.Controls.Add(this.btnDescribe); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btnDesign); diff --git a/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.cs b/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.cs index 2d38a84..7540c17 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/RRuleTestForm.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : RRuleTestForm.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/24/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is a simple demonstration used to test the recurrence engine which encapsulates the iCalendar 2.0 RRULE @@ -76,8 +76,7 @@ private void btnTest_Click(object sender, EventArgs e) lblCount.Text = String.Empty; // Define the recurrence rule by parsing the text - Recurrence r = new Recurrence(txtRRULE.Text); - r.StartDateTime = dtpStartDate.Value; + Recurrence r = new Recurrence(txtRRULE.Text) { StartDateTime = dtpStartDate.Value }; // Get the currently defined set of holidays if necessary if(!r.CanOccurOnHoliday) @@ -162,8 +161,7 @@ private void btnDesign_Click(object sender, EventArgs e) { try { - Recurrence r = new Recurrence(txtRRULE.Text); - r.StartDateTime = dtpStartDate.Value; + Recurrence r = new Recurrence(txtRRULE.Text) { StartDateTime = dtpStartDate.Value }; dlg.SetRecurrence(r); diff --git a/Source/CSharpDemos/PDIWinFormsTest/TimeZoneRegInfo.cs b/Source/CSharpDemos/PDIWinFormsTest/TimeZoneRegInfo.cs index 67a9862..c13a379 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/TimeZoneRegInfo.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/TimeZoneRegInfo.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : TimeZoneRegInfo.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/24/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This class is used to create a time zone information from the time zone data found in the registry on Windows @@ -19,6 +19,8 @@ // 01/05/2005 EFW Factored out the code to share between applications //=============================================================================================================== +// Ignore Spelling: Dlt + using System; using System.Runtime.InteropServices; diff --git a/Source/CSharpDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.cs b/Source/CSharpDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.cs index a4e26fd..8029c96 100644 --- a/Source/CSharpDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.cs +++ b/Source/CSharpDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.cs @@ -63,7 +63,7 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.label1); this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(735, 56); + this.groupBox1.Size = new System.Drawing.Size(904, 66); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Source Date"; @@ -73,29 +73,29 @@ private void InitializeComponent() this.cboSourceTimeZone.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.cboSourceTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboSourceTimeZone.Location = new System.Drawing.Point(292, 24); + this.cboSourceTimeZone.Location = new System.Drawing.Point(366, 22); this.cboSourceTimeZone.MaxDropDownItems = 16; this.cboSourceTimeZone.Name = "cboSourceTimeZone"; - this.cboSourceTimeZone.Size = new System.Drawing.Size(430, 24); + this.cboSourceTimeZone.Size = new System.Drawing.Size(503, 28); this.cboSourceTimeZone.TabIndex = 2; this.cboSourceTimeZone.SelectedIndexChanged += new System.EventHandler(this.UpdateTimes); // // dtpSourceDate // + this.dtpSourceDate.Checked = false; this.dtpSourceDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpSourceDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpSourceDate.Location = new System.Drawing.Point(96, 24); + this.dtpSourceDate.Location = new System.Drawing.Point(125, 22); this.dtpSourceDate.Name = "dtpSourceDate"; - this.dtpSourceDate.Size = new System.Drawing.Size(190, 22); + this.dtpSourceDate.Size = new System.Drawing.Size(235, 26); this.dtpSourceDate.TabIndex = 1; - this.dtpSourceDate.Value = new System.DateTime(2004, 9, 6, 0, 0, 0, 0); this.dtpSourceDate.ValueChanged += new System.EventHandler(this.UpdateTimes); // // label1 // this.label1.Location = new System.Drawing.Point(8, 24); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(80, 23); + this.label1.Size = new System.Drawing.Size(111, 23); this.label1.TabIndex = 0; this.label1.Text = "&Date/Time"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -108,16 +108,17 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.label5); this.groupBox2.Controls.Add(this.lblLocalTime); this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Location = new System.Drawing.Point(12, 74); + this.groupBox2.Location = new System.Drawing.Point(12, 84); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(735, 80); + this.groupBox2.Size = new System.Drawing.Size(904, 91); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "To Local Time"; // // lblLocalBackToSource // - this.lblLocalBackToSource.Location = new System.Drawing.Point(136, 48); + this.lblLocalBackToSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblLocalBackToSource.Location = new System.Drawing.Point(213, 56); this.lblLocalBackToSource.Name = "lblLocalBackToSource"; this.lblLocalBackToSource.Size = new System.Drawing.Size(580, 23); this.lblLocalBackToSource.TabIndex = 3; @@ -125,16 +126,17 @@ private void InitializeComponent() // // label5 // - this.label5.Location = new System.Drawing.Point(6, 48); + this.label5.Location = new System.Drawing.Point(6, 56); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(118, 23); + this.label5.Size = new System.Drawing.Size(201, 23); this.label5.TabIndex = 2; this.label5.Text = "Back to Source"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lblLocalTime // - this.lblLocalTime.Location = new System.Drawing.Point(136, 24); + this.lblLocalTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblLocalTime.Location = new System.Drawing.Point(213, 24); this.lblLocalTime.Name = "lblLocalTime"; this.lblLocalTime.Size = new System.Drawing.Size(580, 23); this.lblLocalTime.TabIndex = 1; @@ -142,9 +144,9 @@ private void InitializeComponent() // // label2 // - this.label2.Location = new System.Drawing.Point(24, 24); + this.label2.Location = new System.Drawing.Point(6, 24); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(100, 23); + this.label2.Size = new System.Drawing.Size(201, 23); this.label2.TabIndex = 0; this.label2.Text = "Local Time"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -159,16 +161,17 @@ private void InitializeComponent() this.groupBox3.Controls.Add(this.label10); this.groupBox3.Controls.Add(this.label6); this.groupBox3.Controls.Add(this.cboDestTimeZone); - this.groupBox3.Location = new System.Drawing.Point(12, 160); + this.groupBox3.Location = new System.Drawing.Point(12, 181); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(735, 112); + this.groupBox3.Size = new System.Drawing.Size(904, 137); this.groupBox3.TabIndex = 2; this.groupBox3.TabStop = false; this.groupBox3.Text = "To Other Time Zone"; // // lblDestBackToSource // - this.lblDestBackToSource.Location = new System.Drawing.Point(132, 80); + this.lblDestBackToSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblDestBackToSource.Location = new System.Drawing.Point(213, 100); this.lblDestBackToSource.Name = "lblDestBackToSource"; this.lblDestBackToSource.Size = new System.Drawing.Size(580, 23); this.lblDestBackToSource.TabIndex = 5; @@ -176,16 +179,17 @@ private void InitializeComponent() // // label8 // - this.label8.Location = new System.Drawing.Point(3, 80); + this.label8.Location = new System.Drawing.Point(8, 100); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(121, 23); + this.label8.Size = new System.Drawing.Size(199, 23); this.label8.TabIndex = 4; this.label8.Text = "Back to Source"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // lblDestTime // - this.lblDestTime.Location = new System.Drawing.Point(132, 56); + this.lblDestTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblDestTime.Location = new System.Drawing.Point(213, 67); this.lblDestTime.Name = "lblDestTime"; this.lblDestTime.Size = new System.Drawing.Size(580, 23); this.lblDestTime.TabIndex = 3; @@ -193,18 +197,18 @@ private void InitializeComponent() // // label10 // - this.label10.Location = new System.Drawing.Point(24, 56); + this.label10.Location = new System.Drawing.Point(8, 67); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(100, 23); + this.label10.Size = new System.Drawing.Size(199, 23); this.label10.TabIndex = 2; this.label10.Text = "Dest. Time"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label6 // - this.label6.Location = new System.Drawing.Point(8, 24); + this.label6.Location = new System.Drawing.Point(8, 32); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(152, 23); + this.label6.Size = new System.Drawing.Size(199, 23); this.label6.TabIndex = 0; this.label6.Text = "Destination &Time Zone"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -214,10 +218,10 @@ private void InitializeComponent() this.cboDestTimeZone.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.cboDestTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboDestTimeZone.Location = new System.Drawing.Point(168, 24); + this.cboDestTimeZone.Location = new System.Drawing.Point(213, 30); this.cboDestTimeZone.MaxDropDownItems = 16; this.cboDestTimeZone.Name = "cboDestTimeZone"; - this.cboDestTimeZone.Size = new System.Drawing.Size(430, 24); + this.cboDestTimeZone.Size = new System.Drawing.Size(503, 28); this.cboDestTimeZone.TabIndex = 1; this.cboDestTimeZone.SelectedIndexChanged += new System.EventHandler(this.UpdateTimes); // @@ -225,9 +229,9 @@ private void InitializeComponent() // this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnClose.Location = new System.Drawing.Point(659, 463); + this.btnClose.Location = new System.Drawing.Point(816, 463); this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(88, 32); + this.btnClose.Size = new System.Drawing.Size(100, 32); this.btnClose.TabIndex = 6; this.btnClose.Text = "Close"; // @@ -236,17 +240,17 @@ private void InitializeComponent() this.txtTimeZoneInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtTimeZoneInfo.Location = new System.Drawing.Point(12, 312); + this.txtTimeZoneInfo.Location = new System.Drawing.Point(12, 347); this.txtTimeZoneInfo.Multiline = true; this.txtTimeZoneInfo.Name = "txtTimeZoneInfo"; this.txtTimeZoneInfo.ReadOnly = true; this.txtTimeZoneInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtTimeZoneInfo.Size = new System.Drawing.Size(735, 143); + this.txtTimeZoneInfo.Size = new System.Drawing.Size(904, 108); this.txtTimeZoneInfo.TabIndex = 4; // // label3 // - this.label3.Location = new System.Drawing.Point(12, 286); + this.label3.Location = new System.Drawing.Point(8, 321); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(160, 23); this.label3.TabIndex = 3; @@ -257,7 +261,7 @@ private void InitializeComponent() this.btnSaveTZs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnSaveTZs.Location = new System.Drawing.Point(12, 463); this.btnSaveTZs.Name = "btnSaveTZs"; - this.btnSaveTZs.Size = new System.Drawing.Size(88, 32); + this.btnSaveTZs.Size = new System.Drawing.Size(100, 32); this.btnSaveTZs.TabIndex = 5; this.btnSaveTZs.Text = "&Save TZs"; this.btnSaveTZs.Click += new System.EventHandler(this.btnSaveTZs_Click); @@ -265,7 +269,7 @@ private void InitializeComponent() // VTimeZoneTestForm // this.CancelButton = this.btnClose; - this.ClientSize = new System.Drawing.Size(759, 507); + this.ClientSize = new System.Drawing.Size(928, 507); this.Controls.Add(this.btnSaveTZs); this.Controls.Add(this.label3); this.Controls.Add(this.txtTimeZoneInfo); diff --git a/Source/CSharpDemos/vCardBrowser/AboutDlg.Designer.cs b/Source/CSharpDemos/vCardBrowser/AboutDlg.Designer.cs index 6e7dfdb..1ee361f 100644 --- a/Source/CSharpDemos/vCardBrowser/AboutDlg.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/AboutDlg.Designer.cs @@ -47,9 +47,9 @@ private void InitializeComponent() // // lnkHelp // - this.lnkHelp.Location = new System.Drawing.Point(168, 301); + this.lnkHelp.Location = new System.Drawing.Point(187, 334); this.lnkHelp.Name = "lnkHelp"; - this.lnkHelp.Size = new System.Drawing.Size(144, 18); + this.lnkHelp.Size = new System.Drawing.Size(216, 23); this.lnkHelp.TabIndex = 6; this.lnkHelp.TabStop = true; this.lnkHelp.Text = "Eric@EWoodruff.us"; @@ -58,13 +58,13 @@ private void InitializeComponent() // ColumnHeader1 // this.ColumnHeader1.Text = "Name"; - this.ColumnHeader1.Width = 250; + this.ColumnHeader1.Width = 275; // // btnSysInfo // - this.btnSysInfo.Location = new System.Drawing.Point(334, 349); + this.btnSysInfo.Location = new System.Drawing.Point(355, 398); this.btnSysInfo.Name = "btnSysInfo"; - this.btnSysInfo.Size = new System.Drawing.Size(112, 32); + this.btnSysInfo.Size = new System.Drawing.Size(150, 32); this.btnSysInfo.TabIndex = 9; this.btnSysInfo.Text = "System Info..."; this.btnSysInfo.Click += new System.EventHandler(this.btnSysInfo_Click); @@ -72,9 +72,9 @@ private void InitializeComponent() // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(216, 349); + this.btnOK.Location = new System.Drawing.Point(199, 398); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(112, 32); + this.btnOK.Size = new System.Drawing.Size(150, 32); this.btnOK.TabIndex = 8; this.btnOK.Text = "OK"; // @@ -86,10 +86,10 @@ private void InitializeComponent() this.lvComponents.FullRowSelect = true; this.lvComponents.GridLines = true; this.lvComponents.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.lvComponents.Location = new System.Drawing.Point(12, 128); + this.lvComponents.Location = new System.Drawing.Point(12, 153); this.lvComponents.MultiSelect = false; this.lvComponents.Name = "lvComponents"; - this.lvComponents.Size = new System.Drawing.Size(434, 170); + this.lvComponents.Size = new System.Drawing.Size(493, 170); this.lvComponents.TabIndex = 4; this.lvComponents.UseCompatibleStateImageBehavior = false; this.lvComponents.View = System.Windows.Forms.View.Details; @@ -101,9 +101,9 @@ private void InitializeComponent() // // Label1 // - this.Label1.Location = new System.Drawing.Point(12, 106); + this.Label1.Location = new System.Drawing.Point(8, 127); this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(164, 19); + this.Label1.Size = new System.Drawing.Size(164, 23); this.Label1.TabIndex = 3; this.Label1.Text = "Product Components"; // @@ -111,23 +111,23 @@ private void InitializeComponent() // this.lblName.Location = new System.Drawing.Point(80, 8); this.lblName.Name = "lblName"; - this.lblName.Size = new System.Drawing.Size(366, 19); + this.lblName.Size = new System.Drawing.Size(425, 23); this.lblName.TabIndex = 0; this.lblName.Text = ""; // // lblDescription // - this.lblDescription.Location = new System.Drawing.Point(80, 56); + this.lblDescription.Location = new System.Drawing.Point(80, 64); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(366, 40); + this.lblDescription.Size = new System.Drawing.Size(425, 67); this.lblDescription.TabIndex = 2; this.lblDescription.Text = ""; // // lblCopyright // - this.lblCopyright.Location = new System.Drawing.Point(12, 327); + this.lblCopyright.Location = new System.Drawing.Point(12, 364); this.lblCopyright.Name = "lblCopyright"; - this.lblCopyright.Size = new System.Drawing.Size(434, 19); + this.lblCopyright.Size = new System.Drawing.Size(493, 23); this.lblCopyright.TabIndex = 7; this.lblCopyright.Text = ""; // @@ -143,17 +143,17 @@ private void InitializeComponent() // // lblVersion // - this.lblVersion.Location = new System.Drawing.Point(80, 32); + this.lblVersion.Location = new System.Drawing.Point(80, 36); this.lblVersion.Name = "lblVersion"; - this.lblVersion.Size = new System.Drawing.Size(366, 19); + this.lblVersion.Size = new System.Drawing.Size(425, 23); this.lblVersion.TabIndex = 1; this.lblVersion.Text = ""; // // label2 // - this.label2.Location = new System.Drawing.Point(12, 301); + this.label2.Location = new System.Drawing.Point(12, 334); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(162, 19); + this.label2.Size = new System.Drawing.Size(178, 23); this.label2.TabIndex = 5; this.label2.Text = "For help send e-mail to"; // @@ -161,7 +161,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnOK; this.CancelButton = this.btnOK; - this.ClientSize = new System.Drawing.Size(458, 393); + this.ClientSize = new System.Drawing.Size(517, 442); this.Controls.Add(this.lnkHelp); this.Controls.Add(this.label2); this.Controls.Add(this.btnSysInfo); diff --git a/Source/CSharpDemos/vCardBrowser/AboutDlg.cs b/Source/CSharpDemos/vCardBrowser/AboutDlg.cs index 5f6c36e..2ab1cbb 100644 --- a/Source/CSharpDemos/vCardBrowser/AboutDlg.cs +++ b/Source/CSharpDemos/vCardBrowser/AboutDlg.cs @@ -1,8 +1,8 @@ //=============================================================================================================== // File : AboutDlg.cs // Author : Eric Woodruff -// Updated : 12/27/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This form is used to display application version information @@ -17,6 +17,8 @@ // 11/10/2003 EFW Created the code //=============================================================================================================== +// Ignore Spelling: mailto + using System; using System.Reflection; using System.Windows.Forms; diff --git a/Source/CSharpDemos/vCardBrowser/AddressControl.Designer.cs b/Source/CSharpDemos/vCardBrowser/AddressControl.Designer.cs index ebaae9f..335593f 100644 --- a/Source/CSharpDemos/vCardBrowser/AddressControl.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/AddressControl.Designer.cs @@ -81,183 +81,183 @@ private void InitializeComponent() this.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlControls.Location = new System.Drawing.Point(0, 0); this.pnlControls.Name = "pnlControls"; - this.pnlControls.Size = new System.Drawing.Size(664, 193); + this.pnlControls.Size = new System.Drawing.Size(685, 212); this.pnlControls.TabIndex = 0; // // btnMap // - this.btnMap.Location = new System.Drawing.Point(266, 102); + this.btnMap.Location = new System.Drawing.Point(298, 104); this.btnMap.Name = "btnMap"; - this.btnMap.Size = new System.Drawing.Size(60, 28); + this.btnMap.Size = new System.Drawing.Size(75, 28); this.btnMap.TabIndex = 14; this.btnMap.Text = "&Map"; this.btnMap.Click += new System.EventHandler(this.btnMap_Click); // // chkPreferred // - this.chkPreferred.Location = new System.Drawing.Point(556, 145); + this.chkPreferred.Location = new System.Drawing.Point(397, 176); this.chkPreferred.Name = "chkPreferred"; - this.chkPreferred.Size = new System.Drawing.Size(96, 24); + this.chkPreferred.Size = new System.Drawing.Size(137, 24); this.chkPreferred.TabIndex = 21; this.chkPreferred.Text = "Preferred"; // // chkWork // - this.chkWork.Location = new System.Drawing.Point(484, 145); + this.chkWork.Location = new System.Drawing.Point(251, 176); this.chkWork.Name = "chkWork"; - this.chkWork.Size = new System.Drawing.Size(66, 24); + this.chkWork.Size = new System.Drawing.Size(137, 24); this.chkWork.TabIndex = 20; this.chkWork.Text = "Work"; // // chkHome // - this.chkHome.Location = new System.Drawing.Point(404, 145); + this.chkHome.Location = new System.Drawing.Point(105, 176); this.chkHome.Name = "chkHome"; - this.chkHome.Size = new System.Drawing.Size(74, 24); + this.chkHome.Size = new System.Drawing.Size(137, 24); this.chkHome.TabIndex = 19; this.chkHome.Text = "Home"; // // chkParcel // - this.chkParcel.Location = new System.Drawing.Point(324, 145); + this.chkParcel.Location = new System.Drawing.Point(543, 146); this.chkParcel.Name = "chkParcel"; - this.chkParcel.Size = new System.Drawing.Size(74, 24); + this.chkParcel.Size = new System.Drawing.Size(137, 24); this.chkParcel.TabIndex = 18; this.chkParcel.Text = "Parcel"; // // chkPostal // - this.chkPostal.Location = new System.Drawing.Point(236, 145); + this.chkPostal.Location = new System.Drawing.Point(397, 146); this.chkPostal.Name = "chkPostal"; - this.chkPostal.Size = new System.Drawing.Size(82, 24); + this.chkPostal.Size = new System.Drawing.Size(137, 24); this.chkPostal.TabIndex = 17; this.chkPostal.Text = "Postal"; // // chkInternational // - this.chkInternational.Location = new System.Drawing.Point(116, 145); + this.chkInternational.Location = new System.Drawing.Point(251, 146); this.chkInternational.Name = "chkInternational"; - this.chkInternational.Size = new System.Drawing.Size(114, 24); + this.chkInternational.Size = new System.Drawing.Size(137, 24); this.chkInternational.TabIndex = 16; this.chkInternational.Text = "International"; // // chkDomestic // - this.chkDomestic.Location = new System.Drawing.Point(20, 145); + this.chkDomestic.Location = new System.Drawing.Point(105, 146); this.chkDomestic.Name = "chkDomestic"; - this.chkDomestic.Size = new System.Drawing.Size(90, 24); + this.chkDomestic.Size = new System.Drawing.Size(137, 24); this.chkDomestic.TabIndex = 15; this.chkDomestic.Text = "Domestic"; // // txtCountry // - this.txtCountry.Location = new System.Drawing.Point(87, 105); + this.txtCountry.Location = new System.Drawing.Point(105, 105); this.txtCountry.Name = "txtCountry"; - this.txtCountry.Size = new System.Drawing.Size(168, 22); + this.txtCountry.Size = new System.Drawing.Size(168, 26); this.txtCountry.TabIndex = 13; // // label18 // - this.label18.Location = new System.Drawing.Point(17, 105); + this.label18.Location = new System.Drawing.Point(7, 107); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(64, 23); + this.label18.Size = new System.Drawing.Size(92, 23); this.label18.TabIndex = 12; this.label18.Text = "Country"; this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtPostalCode // - this.txtPostalCode.Location = new System.Drawing.Point(535, 73); + this.txtPostalCode.Location = new System.Drawing.Point(593, 73); this.txtPostalCode.Name = "txtPostalCode"; - this.txtPostalCode.Size = new System.Drawing.Size(80, 22); + this.txtPostalCode.Size = new System.Drawing.Size(80, 26); this.txtPostalCode.TabIndex = 11; // // label17 // - this.label17.Location = new System.Drawing.Point(439, 73); + this.label17.Location = new System.Drawing.Point(478, 75); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(90, 23); + this.label17.Size = new System.Drawing.Size(109, 23); this.label17.TabIndex = 10; this.label17.Text = "Postal Code"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtRegion // - this.txtRegion.Location = new System.Drawing.Point(351, 73); + this.txtRegion.Location = new System.Drawing.Point(392, 73); this.txtRegion.Name = "txtRegion"; - this.txtRegion.Size = new System.Drawing.Size(80, 22); + this.txtRegion.Size = new System.Drawing.Size(80, 26); this.txtRegion.TabIndex = 9; // // label16 // - this.label16.Location = new System.Drawing.Point(265, 73); + this.label16.Location = new System.Drawing.Point(279, 75); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(80, 23); + this.label16.Size = new System.Drawing.Size(107, 23); this.label16.TabIndex = 8; this.label16.Text = "State/Prov"; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtLocality // - this.txtLocality.Location = new System.Drawing.Point(87, 73); + this.txtLocality.Location = new System.Drawing.Point(105, 73); this.txtLocality.Name = "txtLocality"; - this.txtLocality.Size = new System.Drawing.Size(168, 22); + this.txtLocality.Size = new System.Drawing.Size(168, 26); this.txtLocality.TabIndex = 7; // // label15 // - this.label15.Location = new System.Drawing.Point(41, 73); + this.label15.Location = new System.Drawing.Point(38, 75); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(40, 23); + this.label15.Size = new System.Drawing.Size(61, 23); this.label15.TabIndex = 6; this.label15.Text = "City"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtPOBox // - this.txtPOBox.Location = new System.Drawing.Point(511, 9); + this.txtPOBox.Location = new System.Drawing.Point(565, 9); this.txtPOBox.Name = "txtPOBox"; - this.txtPOBox.Size = new System.Drawing.Size(144, 22); + this.txtPOBox.Size = new System.Drawing.Size(108, 26); this.txtPOBox.TabIndex = 3; // // label14 // - this.label14.Location = new System.Drawing.Point(449, 9); + this.label14.Location = new System.Drawing.Point(482, 11); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(56, 23); + this.label14.Size = new System.Drawing.Size(77, 23); this.label14.TabIndex = 2; this.label14.Text = "PO Box"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtExtendedAddress // - this.txtExtendedAddress.Location = new System.Drawing.Point(87, 41); + this.txtExtendedAddress.Location = new System.Drawing.Point(105, 41); this.txtExtendedAddress.Name = "txtExtendedAddress"; - this.txtExtendedAddress.Size = new System.Drawing.Size(344, 22); + this.txtExtendedAddress.Size = new System.Drawing.Size(367, 26); this.txtExtendedAddress.TabIndex = 5; // // label13 // - this.label13.Location = new System.Drawing.Point(9, 41); + this.label13.Location = new System.Drawing.Point(3, 43); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(72, 23); + this.label13.Size = new System.Drawing.Size(96, 23); this.label13.TabIndex = 4; this.label13.Text = "Address 2"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtStreetAddress // - this.txtStreetAddress.Location = new System.Drawing.Point(87, 9); + this.txtStreetAddress.Location = new System.Drawing.Point(105, 9); this.txtStreetAddress.Name = "txtStreetAddress"; - this.txtStreetAddress.Size = new System.Drawing.Size(344, 22); + this.txtStreetAddress.Size = new System.Drawing.Size(367, 26); this.txtStreetAddress.TabIndex = 1; this.txtStreetAddress.Validating += new System.ComponentModel.CancelEventHandler(this.txtStreetAddress_Validating); // // label12 // - this.label12.Location = new System.Drawing.Point(9, 9); + this.label12.Location = new System.Drawing.Point(3, 11); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(72, 23); + this.label12.Size = new System.Drawing.Size(96, 23); this.label12.TabIndex = 0; this.label12.Text = "&Address 1"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -266,7 +266,7 @@ private void InitializeComponent() // this.Controls.Add(this.pnlControls); this.Name = "AddressControl"; - this.Size = new System.Drawing.Size(664, 220); + this.Size = new System.Drawing.Size(685, 240); this.Controls.SetChildIndex(this.pnlControls, 0); this.pnlControls.ResumeLayout(false); this.pnlControls.PerformLayout(); diff --git a/Source/CSharpDemos/vCardBrowser/EMailControl.Designer.cs b/Source/CSharpDemos/vCardBrowser/EMailControl.Designer.cs index 38c1b8c..45b2dc9 100644 --- a/Source/CSharpDemos/vCardBrowser/EMailControl.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/EMailControl.Designer.cs @@ -49,54 +49,54 @@ private void InitializeComponent() this.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlControls.Location = new System.Drawing.Point(0, 0); this.pnlControls.Name = "pnlControls"; - this.pnlControls.Size = new System.Drawing.Size(470, 77); + this.pnlControls.Size = new System.Drawing.Size(532, 76); this.pnlControls.TabIndex = 0; // // chkPreferred // - this.chkPreferred.Location = new System.Drawing.Point(346, 44); + this.chkPreferred.Location = new System.Drawing.Point(386, 44); this.chkPreferred.Name = "chkPreferred"; - this.chkPreferred.Size = new System.Drawing.Size(98, 24); + this.chkPreferred.Size = new System.Drawing.Size(120, 24); this.chkPreferred.TabIndex = 5; this.chkPreferred.Text = "Preferred"; // // chkX400 // - this.chkX400.Location = new System.Drawing.Point(256, 44); + this.chkX400.Location = new System.Drawing.Point(281, 44); this.chkX400.Name = "chkX400"; - this.chkX400.Size = new System.Drawing.Size(72, 24); + this.chkX400.Size = new System.Drawing.Size(99, 24); this.chkX400.TabIndex = 4; this.chkX400.Text = "X400"; // // chkInternet // - this.chkInternet.Location = new System.Drawing.Point(136, 44); + this.chkInternet.Location = new System.Drawing.Point(173, 44); this.chkInternet.Name = "chkInternet"; - this.chkInternet.Size = new System.Drawing.Size(104, 24); + this.chkInternet.Size = new System.Drawing.Size(102, 24); this.chkInternet.TabIndex = 3; this.chkInternet.Text = "Internet"; // // chkAOL // - this.chkAOL.Location = new System.Drawing.Point(36, 44); + this.chkAOL.Location = new System.Drawing.Point(76, 44); this.chkAOL.Name = "chkAOL"; - this.chkAOL.Size = new System.Drawing.Size(84, 24); + this.chkAOL.Size = new System.Drawing.Size(91, 24); this.chkAOL.TabIndex = 2; this.chkAOL.Text = "AOL"; // // txtEMailAddress // - this.txtEMailAddress.Location = new System.Drawing.Point(76, 12); + this.txtEMailAddress.Location = new System.Drawing.Point(76, 10); this.txtEMailAddress.Name = "txtEMailAddress"; - this.txtEMailAddress.Size = new System.Drawing.Size(368, 22); + this.txtEMailAddress.Size = new System.Drawing.Size(430, 26); this.txtEMailAddress.TabIndex = 1; this.txtEMailAddress.Validating += new System.ComponentModel.CancelEventHandler(this.txtEMailAddress_Validating); // // label12 // - this.label12.Location = new System.Drawing.Point(15, 12); + this.label12.Location = new System.Drawing.Point(1, 12); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(55, 23); + this.label12.Size = new System.Drawing.Size(69, 23); this.label12.TabIndex = 0; this.label12.Text = "&E-Mail"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -105,7 +105,7 @@ private void InitializeComponent() // this.Controls.Add(this.pnlControls); this.Name = "EMailControl"; - this.Size = new System.Drawing.Size(470, 104); + this.Size = new System.Drawing.Size(532, 104); this.Controls.SetChildIndex(this.pnlControls, 0); this.pnlControls.ResumeLayout(false); this.pnlControls.PerformLayout(); diff --git a/Source/CSharpDemos/vCardBrowser/LabelControl.Designer.cs b/Source/CSharpDemos/vCardBrowser/LabelControl.Designer.cs index 740a448..879439c 100644 --- a/Source/CSharpDemos/vCardBrowser/LabelControl.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/LabelControl.Designer.cs @@ -55,22 +55,22 @@ private void InitializeComponent() this.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlControls.Location = new System.Drawing.Point(0, 0); this.pnlControls.Name = "pnlControls"; - this.pnlControls.Size = new System.Drawing.Size(464, 173); + this.pnlControls.Size = new System.Drawing.Size(648, 172); this.pnlControls.TabIndex = 0; // // chkPreferred // - this.chkPreferred.Location = new System.Drawing.Point(286, 138); + this.chkPreferred.Location = new System.Drawing.Point(356, 138); this.chkPreferred.Name = "chkPreferred"; - this.chkPreferred.Size = new System.Drawing.Size(96, 24); + this.chkPreferred.Size = new System.Drawing.Size(137, 24); this.chkPreferred.TabIndex = 8; this.chkPreferred.Text = "Preferred"; // // chkWork // - this.chkWork.Location = new System.Drawing.Point(166, 138); + this.chkWork.Location = new System.Drawing.Point(213, 138); this.chkWork.Name = "chkWork"; - this.chkWork.Size = new System.Drawing.Size(72, 24); + this.chkWork.Size = new System.Drawing.Size(137, 24); this.chkWork.TabIndex = 7; this.chkWork.Text = "Work"; // @@ -78,31 +78,31 @@ private void InitializeComponent() // this.chkHome.Location = new System.Drawing.Point(70, 138); this.chkHome.Name = "chkHome"; - this.chkHome.Size = new System.Drawing.Size(78, 24); + this.chkHome.Size = new System.Drawing.Size(137, 24); this.chkHome.TabIndex = 6; this.chkHome.Text = "Home"; // // chkParcel // - this.chkParcel.Location = new System.Drawing.Point(372, 108); + this.chkParcel.Location = new System.Drawing.Point(499, 108); this.chkParcel.Name = "chkParcel"; - this.chkParcel.Size = new System.Drawing.Size(78, 24); + this.chkParcel.Size = new System.Drawing.Size(137, 24); this.chkParcel.TabIndex = 5; this.chkParcel.Text = "Parcel"; // // chkPostal // - this.chkPostal.Location = new System.Drawing.Point(286, 108); + this.chkPostal.Location = new System.Drawing.Point(356, 108); this.chkPostal.Name = "chkPostal"; - this.chkPostal.Size = new System.Drawing.Size(80, 24); + this.chkPostal.Size = new System.Drawing.Size(137, 24); this.chkPostal.TabIndex = 4; this.chkPostal.Text = "Postal"; // // chkInternational // - this.chkInternational.Location = new System.Drawing.Point(166, 108); + this.chkInternational.Location = new System.Drawing.Point(213, 108); this.chkInternational.Name = "chkInternational"; - this.chkInternational.Size = new System.Drawing.Size(114, 24); + this.chkInternational.Size = new System.Drawing.Size(137, 24); this.chkInternational.TabIndex = 3; this.chkInternational.Text = "International"; // @@ -110,7 +110,7 @@ private void InitializeComponent() // this.chkDomestic.Location = new System.Drawing.Point(70, 108); this.chkDomestic.Name = "chkDomestic"; - this.chkDomestic.Size = new System.Drawing.Size(90, 24); + this.chkDomestic.Size = new System.Drawing.Size(137, 24); this.chkDomestic.TabIndex = 2; this.chkDomestic.Text = "Domestic"; // @@ -121,15 +121,15 @@ private void InitializeComponent() this.txtLabelText.Multiline = true; this.txtLabelText.Name = "txtLabelText"; this.txtLabelText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtLabelText.Size = new System.Drawing.Size(368, 88); + this.txtLabelText.Size = new System.Drawing.Size(566, 88); this.txtLabelText.TabIndex = 1; this.txtLabelText.Validating += new System.ComponentModel.CancelEventHandler(this.txtLabelText_Validating); // // label12 // - this.label12.Location = new System.Drawing.Point(14, 12); + this.label12.Location = new System.Drawing.Point(3, 12); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(48, 23); + this.label12.Size = new System.Drawing.Size(59, 23); this.label12.TabIndex = 0; this.label12.Text = "&Label"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -138,7 +138,7 @@ private void InitializeComponent() // this.Controls.Add(this.pnlControls); this.Name = "LabelControl"; - this.Size = new System.Drawing.Size(464, 200); + this.Size = new System.Drawing.Size(648, 200); this.Controls.SetChildIndex(this.pnlControls, 0); this.pnlControls.ResumeLayout(false); this.pnlControls.PerformLayout(); diff --git a/Source/CSharpDemos/vCardBrowser/PhoneControl.Designer.cs b/Source/CSharpDemos/vCardBrowser/PhoneControl.Designer.cs index 7bd0700..63fe1dc 100644 --- a/Source/CSharpDemos/vCardBrowser/PhoneControl.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/PhoneControl.Designer.cs @@ -44,10 +44,10 @@ private void InitializeComponent() // // pnlControls // + this.pnlControls.Controls.Add(this.chkHome); this.pnlControls.Controls.Add(this.chkPager); this.pnlControls.Controls.Add(this.chkPreferred); this.pnlControls.Controls.Add(this.chkWork); - this.pnlControls.Controls.Add(this.chkHome); this.pnlControls.Controls.Add(this.chkCell); this.pnlControls.Controls.Add(this.chkMessage); this.pnlControls.Controls.Add(this.chkFax); @@ -57,86 +57,86 @@ private void InitializeComponent() this.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlControls.Location = new System.Drawing.Point(0, 0); this.pnlControls.Name = "pnlControls"; - this.pnlControls.Size = new System.Drawing.Size(470, 101); + this.pnlControls.Size = new System.Drawing.Size(673, 100); this.pnlControls.TabIndex = 0; // // chkPager // - this.chkPager.Location = new System.Drawing.Point(246, 70); + this.chkPager.Location = new System.Drawing.Point(381, 70); this.chkPager.Name = "chkPager"; - this.chkPager.Size = new System.Drawing.Size(86, 24); + this.chkPager.Size = new System.Drawing.Size(137, 24); this.chkPager.TabIndex = 8; this.chkPager.Text = "Pager"; // // chkPreferred // - this.chkPreferred.Location = new System.Drawing.Point(366, 70); + this.chkPreferred.Location = new System.Drawing.Point(524, 70); this.chkPreferred.Name = "chkPreferred"; - this.chkPreferred.Size = new System.Drawing.Size(101, 24); + this.chkPreferred.Size = new System.Drawing.Size(137, 24); this.chkPreferred.TabIndex = 9; this.chkPreferred.Text = "Preferred"; // // chkWork // - this.chkWork.Location = new System.Drawing.Point(14, 40); + this.chkWork.Location = new System.Drawing.Point(95, 40); this.chkWork.Name = "chkWork"; - this.chkWork.Size = new System.Drawing.Size(78, 24); + this.chkWork.Size = new System.Drawing.Size(137, 24); this.chkWork.TabIndex = 2; this.chkWork.Text = "Work"; // // chkHome // - this.chkHome.Location = new System.Drawing.Point(126, 40); + this.chkHome.Location = new System.Drawing.Point(238, 40); this.chkHome.Name = "chkHome"; - this.chkHome.Size = new System.Drawing.Size(88, 24); + this.chkHome.Size = new System.Drawing.Size(137, 24); this.chkHome.TabIndex = 3; this.chkHome.Text = "Home"; // // chkCell // - this.chkCell.Location = new System.Drawing.Point(126, 70); + this.chkCell.Location = new System.Drawing.Point(238, 70); this.chkCell.Name = "chkCell"; - this.chkCell.Size = new System.Drawing.Size(64, 24); + this.chkCell.Size = new System.Drawing.Size(137, 24); this.chkCell.TabIndex = 7; this.chkCell.Text = "Cell"; // // chkMessage // - this.chkMessage.Location = new System.Drawing.Point(14, 70); + this.chkMessage.Location = new System.Drawing.Point(95, 70); this.chkMessage.Name = "chkMessage"; - this.chkMessage.Size = new System.Drawing.Size(88, 24); + this.chkMessage.Size = new System.Drawing.Size(137, 24); this.chkMessage.TabIndex = 6; this.chkMessage.Text = "Message"; // // chkFax // - this.chkFax.Location = new System.Drawing.Point(366, 40); + this.chkFax.Location = new System.Drawing.Point(524, 40); this.chkFax.Name = "chkFax"; - this.chkFax.Size = new System.Drawing.Size(56, 24); + this.chkFax.Size = new System.Drawing.Size(137, 24); this.chkFax.TabIndex = 5; this.chkFax.Text = "Fax"; // // chkVoice // - this.chkVoice.Location = new System.Drawing.Point(246, 40); + this.chkVoice.Location = new System.Drawing.Point(381, 40); this.chkVoice.Name = "chkVoice"; - this.chkVoice.Size = new System.Drawing.Size(86, 24); + this.chkVoice.Size = new System.Drawing.Size(137, 24); this.chkVoice.TabIndex = 4; this.chkVoice.Text = "Voice"; // // txtPhoneNumber // - this.txtPhoneNumber.Location = new System.Drawing.Point(78, 8); + this.txtPhoneNumber.Location = new System.Drawing.Point(95, 8); this.txtPhoneNumber.Name = "txtPhoneNumber"; - this.txtPhoneNumber.Size = new System.Drawing.Size(368, 22); + this.txtPhoneNumber.Size = new System.Drawing.Size(566, 26); this.txtPhoneNumber.TabIndex = 1; this.txtPhoneNumber.Validating += new System.ComponentModel.CancelEventHandler(this.txtPhoneNumber_Validating); // // label12 // - this.label12.Location = new System.Drawing.Point(6, 8); + this.label12.Location = new System.Drawing.Point(5, 10); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(64, 23); + this.label12.Size = new System.Drawing.Size(84, 23); this.label12.TabIndex = 0; this.label12.Text = "&Phone #"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -145,7 +145,7 @@ private void InitializeComponent() // this.Controls.Add(this.pnlControls); this.Name = "PhoneControl"; - this.Size = new System.Drawing.Size(470, 128); + this.Size = new System.Drawing.Size(673, 128); this.Controls.SetChildIndex(this.pnlControls, 0); this.pnlControls.ResumeLayout(false); this.pnlControls.PerformLayout(); diff --git a/Source/CSharpDemos/vCardBrowser/PhotoControl.Designer.cs b/Source/CSharpDemos/vCardBrowser/PhotoControl.Designer.cs index c5a6316..f304a8a 100644 --- a/Source/CSharpDemos/vCardBrowser/PhotoControl.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/PhotoControl.Designer.cs @@ -55,42 +55,42 @@ private void InitializeComponent() // // label1 // - this.label1.Location = new System.Drawing.Point(214, 8); + this.label1.Location = new System.Drawing.Point(218, 19); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 23); + this.label1.Size = new System.Drawing.Size(63, 23); this.label1.TabIndex = 0; this.label1.Text = "&Name"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtFilename // - this.txtFilename.Location = new System.Drawing.Point(272, 8); + this.txtFilename.Location = new System.Drawing.Point(287, 17); this.txtFilename.Name = "txtFilename"; - this.txtFilename.Size = new System.Drawing.Size(280, 22); + this.txtFilename.Size = new System.Drawing.Size(280, 26); this.txtFilename.TabIndex = 1; // // btnLoad // - this.btnLoad.Location = new System.Drawing.Point(552, 7); + this.btnLoad.Location = new System.Drawing.Point(573, 16); this.btnLoad.Name = "btnLoad"; - this.btnLoad.Size = new System.Drawing.Size(28, 24); + this.btnLoad.Size = new System.Drawing.Size(35, 28); this.btnLoad.TabIndex = 2; this.btnLoad.Text = "..."; this.btnLoad.Click += new System.EventHandler(this.btnLoad_Click); // // chkInline // - this.chkInline.Location = new System.Drawing.Point(272, 36); + this.chkInline.Location = new System.Drawing.Point(287, 49); this.chkInline.Name = "chkInline"; - this.chkInline.Size = new System.Drawing.Size(192, 24); + this.chkInline.Size = new System.Drawing.Size(280, 24); this.chkInline.TabIndex = 3; this.chkInline.Text = "Store image in vCard"; // // label2 // - this.label2.Location = new System.Drawing.Point(217, 66); + this.label2.Location = new System.Drawing.Point(219, 81); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(49, 23); + this.label2.Size = new System.Drawing.Size(62, 23); this.label2.TabIndex = 4; this.label2.Text = "Type"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -115,10 +115,10 @@ private void InitializeComponent() "AVI", "QTIME", "PNG"}); - this.cboImageType.Location = new System.Drawing.Point(272, 66); + this.cboImageType.Location = new System.Drawing.Point(287, 79); this.cboImageType.MaxDropDownItems = 16; this.cboImageType.Name = "cboImageType"; - this.cboImageType.Size = new System.Drawing.Size(96, 24); + this.cboImageType.Size = new System.Drawing.Size(152, 28); this.cboImageType.TabIndex = 5; // // PhotoControl @@ -131,7 +131,7 @@ private void InitializeComponent() this.Controls.Add(this.label1); this.Controls.Add(this.pnlPhoto); this.Name = "PhotoControl"; - this.Size = new System.Drawing.Size(588, 208); + this.Size = new System.Drawing.Size(619, 208); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Source/CSharpDemos/vCardBrowser/PhotoControl.cs b/Source/CSharpDemos/vCardBrowser/PhotoControl.cs index fe6baf6..8748e12 100644 --- a/Source/CSharpDemos/vCardBrowser/PhotoControl.cs +++ b/Source/CSharpDemos/vCardBrowser/PhotoControl.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : PhotoControl.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/27/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit a vCard's photo and logo information. It's nothing elaborate but does let you edit the @@ -19,6 +19,8 @@ // 10/31/2004 EFW Created the code //=============================================================================================================== +// Ignore Spelling: http https + using System; using System.ComponentModel; using System.Drawing; @@ -51,7 +53,7 @@ public partial class PhotoControl : System.Windows.Forms.UserControl [DefaultValue(""), Description("The filename for the image")] public string ImageFilename { - get { return txtFilename.Text; } + get => txtFilename.Text; set { Stream s = null; @@ -80,12 +82,12 @@ public string ImageFilename } else if(value.StartsWith("file:", StringComparison.OrdinalIgnoreCase)) - { - FileWebRequest frq = (FileWebRequest)WebRequest.Create(new Uri(value)); + { + FileWebRequest frq = (FileWebRequest)WebRequest.Create(new Uri(value)); - WebResponse frsp = frq.GetResponse(); - s = frsp.GetResponseStream(); - } + WebResponse frsp = frq.GetResponse(); + s = frsp.GetResponseStream(); + } bmImage.Dispose(); bmImage = new Bitmap(s); @@ -130,7 +132,7 @@ public string ImageFilename [DefaultValue("GIF"), Description("The image type")] public string ImageType { - get { return (string)cboImageType.SelectedItem; } + get => (string)cboImageType.SelectedItem; set { int idx = (value != null) ? cboImageType.Items.IndexOf(value) : 0; @@ -149,8 +151,8 @@ public string ImageType [DefaultValue(false), Description("True to store the image in the vCard or false if it is stored externally")] public bool IsInline { - get { return chkInline.Checked; } - set { chkInline.Checked = value; } + get => chkInline.Checked; + set => chkInline.Checked = value; } #endregion diff --git a/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.Designer.cs b/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.Designer.cs index e7cd1ed..a9a9e33 100644 --- a/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.Designer.cs @@ -108,7 +108,7 @@ private void InitializeComponent() this.miFile}); this.mnuMain.Location = new System.Drawing.Point(0, 0); this.mnuMain.Name = "mnuMain"; - this.mnuMain.Size = new System.Drawing.Size(942, 25); + this.mnuMain.Size = new System.Drawing.Size(942, 28); this.mnuMain.TabIndex = 0; // // miFile @@ -125,14 +125,14 @@ private void InitializeComponent() this.miAbout, this.miExit}); this.miFile.Name = "miFile"; - this.miFile.Size = new System.Drawing.Size(42, 21); + this.miFile.Size = new System.Drawing.Size(46, 24); this.miFile.Text = "&File"; // // miOpen // this.miOpen.Name = "miOpen"; this.miOpen.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.miOpen.Size = new System.Drawing.Size(209, 22); + this.miOpen.Size = new System.Drawing.Size(240, 30); this.miOpen.Text = "&Open"; this.miOpen.Click += new System.EventHandler(this.miOpen_Click); // @@ -140,14 +140,14 @@ private void InitializeComponent() // this.miSave.Name = "miSave"; this.miSave.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.miSave.Size = new System.Drawing.Size(209, 22); + this.miSave.Size = new System.Drawing.Size(240, 30); this.miSave.Text = "&Save"; this.miSave.Click += new System.EventHandler(this.miSave_Click); // // menuItem2 // this.menuItem2.Name = "menuItem2"; - this.menuItem2.Size = new System.Drawing.Size(206, 6); + this.menuItem2.Size = new System.Drawing.Size(237, 6); // // miFileEncoding // @@ -156,7 +156,7 @@ private void InitializeComponent() this.miFileWestEuro, this.miFileASCII}); this.miFileEncoding.Name = "miFileEncoding"; - this.miFileEncoding.Size = new System.Drawing.Size(209, 22); + this.miFileEncoding.Size = new System.Drawing.Size(240, 30); this.miFileEncoding.Text = "File Encoding"; // // miFileUnicode @@ -164,21 +164,21 @@ private void InitializeComponent() this.miFileUnicode.Checked = true; this.miFileUnicode.CheckState = System.Windows.Forms.CheckState.Checked; this.miFileUnicode.Name = "miFileUnicode"; - this.miFileUnicode.Size = new System.Drawing.Size(265, 26); + this.miFileUnicode.Size = new System.Drawing.Size(302, 30); this.miFileUnicode.Text = "Unicode (UTF-8)"; this.miFileUnicode.Click += new System.EventHandler(this.ChangeFileEncoding_Click); // // miFileWestEuro // this.miFileWestEuro.Name = "miFileWestEuro"; - this.miFileWestEuro.Size = new System.Drawing.Size(265, 26); + this.miFileWestEuro.Size = new System.Drawing.Size(302, 30); this.miFileWestEuro.Text = "Western European (Windows)"; this.miFileWestEuro.Click += new System.EventHandler(this.ChangeFileEncoding_Click); // // miFileASCII // this.miFileASCII.Name = "miFileASCII"; - this.miFileASCII.Size = new System.Drawing.Size(265, 26); + this.miFileASCII.Size = new System.Drawing.Size(302, 30); this.miFileASCII.Text = "ASCII"; this.miFileASCII.Click += new System.EventHandler(this.ChangeFileEncoding_Click); // @@ -189,20 +189,20 @@ private void InitializeComponent() this.miPropWestEuro, this.miPropASCII}); this.miPropEncoding.Name = "miPropEncoding"; - this.miPropEncoding.Size = new System.Drawing.Size(209, 22); + this.miPropEncoding.Size = new System.Drawing.Size(240, 30); this.miPropEncoding.Text = "Property Encoding"; // // miPropUnicode // this.miPropUnicode.Name = "miPropUnicode"; - this.miPropUnicode.Size = new System.Drawing.Size(265, 26); + this.miPropUnicode.Size = new System.Drawing.Size(302, 30); this.miPropUnicode.Text = "Unicode (UTF-8)"; this.miPropUnicode.Click += new System.EventHandler(this.ChangePropEncoding_Click); // // miPropWestEuro // this.miPropWestEuro.Name = "miPropWestEuro"; - this.miPropWestEuro.Size = new System.Drawing.Size(265, 26); + this.miPropWestEuro.Size = new System.Drawing.Size(302, 30); this.miPropWestEuro.Text = "Western European (Windows)"; this.miPropWestEuro.Click += new System.EventHandler(this.ChangePropEncoding_Click); // @@ -211,38 +211,38 @@ private void InitializeComponent() this.miPropASCII.Checked = true; this.miPropASCII.CheckState = System.Windows.Forms.CheckState.Checked; this.miPropASCII.Name = "miPropASCII"; - this.miPropASCII.Size = new System.Drawing.Size(265, 26); + this.miPropASCII.Size = new System.Drawing.Size(302, 30); this.miPropASCII.Text = "ASCII"; this.miPropASCII.Click += new System.EventHandler(this.ChangePropEncoding_Click); // // menuItem4 // this.menuItem4.Name = "menuItem4"; - this.menuItem4.Size = new System.Drawing.Size(206, 6); + this.menuItem4.Size = new System.Drawing.Size(237, 6); // // miClear // this.miClear.Name = "miClear"; - this.miClear.Size = new System.Drawing.Size(209, 22); + this.miClear.Size = new System.Drawing.Size(240, 30); this.miClear.Text = "&Clear"; this.miClear.Click += new System.EventHandler(this.miClear_Click); // // menuItem6 // this.menuItem6.Name = "menuItem6"; - this.menuItem6.Size = new System.Drawing.Size(206, 6); + this.menuItem6.Size = new System.Drawing.Size(237, 6); // // miAbout // this.miAbout.Name = "miAbout"; - this.miAbout.Size = new System.Drawing.Size(209, 22); + this.miAbout.Size = new System.Drawing.Size(240, 30); this.miAbout.Text = "&About vCard Browser"; this.miAbout.Click += new System.EventHandler(this.miAbout_Click); // // miExit // this.miExit.Name = "miExit"; - this.miExit.Size = new System.Drawing.Size(209, 22); + this.miExit.Size = new System.Drawing.Size(240, 30); this.miExit.Text = "E&xit"; this.miExit.Click += new System.EventHandler(this.miExit_Click); // @@ -253,17 +253,17 @@ private void InitializeComponent() this.cboVersion.Items.AddRange(new object[] { "2.1", "3.0"}); - this.cboVersion.Location = new System.Drawing.Point(780, 521); + this.cboVersion.Location = new System.Drawing.Point(771, 519); this.cboVersion.Name = "cboVersion"; - this.cboVersion.Size = new System.Drawing.Size(56, 24); + this.cboVersion.Size = new System.Drawing.Size(65, 28); this.cboVersion.TabIndex = 7; // // label23 // this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.label23.Location = new System.Drawing.Point(710, 521); + this.label23.Location = new System.Drawing.Point(662, 521); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(64, 23); + this.label23.Size = new System.Drawing.Size(103, 23); this.label23.TabIndex = 6; this.label23.Text = "&Version"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -285,7 +285,7 @@ private void InitializeComponent() this.lblFilename.BackColor = System.Drawing.SystemColors.ActiveCaption; this.lblFilename.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFilename.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblFilename.Location = new System.Drawing.Point(12, 25); + this.lblFilename.Location = new System.Drawing.Point(12, 28); this.lblFilename.Name = "lblFilename"; this.lblFilename.Size = new System.Drawing.Size(918, 23); this.lblFilename.TabIndex = 1; @@ -314,7 +314,7 @@ private void InitializeComponent() this.tbcTitle, this.tbcOrganization, this.tbcLastRevision}); - this.dgvCards.Location = new System.Drawing.Point(12, 51); + this.dgvCards.Location = new System.Drawing.Point(12, 54); this.dgvCards.MultiSelect = false; this.dgvCards.Name = "dgvCards"; this.dgvCards.ReadOnly = true; @@ -329,7 +329,7 @@ private void InitializeComponent() this.dgvCards.RowHeadersWidth = 25; this.dgvCards.RowTemplate.Height = 24; this.dgvCards.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCards.Size = new System.Drawing.Size(918, 459); + this.dgvCards.Size = new System.Drawing.Size(918, 456); this.dgvCards.StandardTab = true; this.dgvCards.TabIndex = 2; this.dgvCards.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCards_CellDoubleClick); @@ -350,7 +350,7 @@ private void InitializeComponent() this.tbcName.HeaderText = "Name"; this.tbcName.Name = "tbcName"; this.tbcName.ReadOnly = true; - this.tbcName.Width = 250; + this.tbcName.Width = 240; // // tbcTitle // @@ -366,7 +366,7 @@ private void InitializeComponent() this.tbcOrganization.HeaderText = "Organization"; this.tbcOrganization.Name = "tbcOrganization"; this.tbcOrganization.ReadOnly = true; - this.tbcOrganization.Width = 200; + this.tbcOrganization.Width = 185; // // tbcLastRevision // @@ -374,7 +374,7 @@ private void InitializeComponent() this.tbcLastRevision.HeaderText = "Last Revision"; this.tbcLastRevision.Name = "tbcLastRevision"; this.tbcLastRevision.ReadOnly = true; - this.tbcLastRevision.Width = 150; + this.tbcLastRevision.Width = 175; // // VCardBrowserForm // diff --git a/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.cs b/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.cs index a522b9e..5b88357 100644 --- a/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.cs +++ b/Source/CSharpDemos/vCardBrowser/VCardBrowserForm.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : VCardBrowserForm.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/27/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is a simple demonstration application that shows how to load, save, and manage a set of vCards including @@ -76,10 +76,12 @@ public VCardBrowserForm() tbcVersion.HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter; // The string format to use when drawing the status text - sf = new StringFormat(StringFormatFlags.NoWrap); - sf.Alignment = StringAlignment.Center; - sf.LineAlignment = StringAlignment.Center; - sf.Trimming = StringTrimming.EllipsisCharacter; + sf = new StringFormat(StringFormatFlags.NoWrap) + { + Alignment = StringAlignment.Center, + LineAlignment = StringAlignment.Center, + Trimming = StringTrimming.EllipsisCharacter + }; dgvCards.AutoGenerateColumns = false; tbcLastRevision.DefaultCellStyle.Format = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " " + @@ -523,7 +525,8 @@ private void dgvCards_CellPainting(object sender, DataGridViewCellPaintingEventA /// The event arguments private void dgvCards_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - btnEdit_Click(sender, e); + if(e.RowIndex > -1) + btnEdit_Click(sender, e); } #endregion } diff --git a/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.Designer.cs b/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.Designer.cs index 1999d50..7102cb9 100644 --- a/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.Designer.cs +++ b/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.Designer.cs @@ -124,10 +124,10 @@ private void InitializeComponent() this.tabInfo.Controls.Add(this.pgOther); this.tabInfo.Controls.Add(this.pgPhoto); this.tabInfo.Controls.Add(this.pgLogo); - this.tabInfo.Location = new System.Drawing.Point(12, 72); + this.tabInfo.Location = new System.Drawing.Point(12, 92); this.tabInfo.Name = "tabInfo"; this.tabInfo.SelectedIndex = 0; - this.tabInfo.Size = new System.Drawing.Size(682, 303); + this.tabInfo.Size = new System.Drawing.Size(721, 322); this.tabInfo.TabIndex = 8; // // pgName @@ -149,9 +149,9 @@ private void InitializeComponent() this.pgName.Controls.Add(this.label2); this.pgName.Controls.Add(this.txtLastName); this.pgName.Controls.Add(this.label1); - this.pgName.Location = new System.Drawing.Point(4, 25); + this.pgName.Location = new System.Drawing.Point(4, 29); this.pgName.Name = "pgName"; - this.pgName.Size = new System.Drawing.Size(674, 274); + this.pgName.Size = new System.Drawing.Size(713, 289); this.pgName.TabIndex = 0; this.pgName.Text = "Name"; this.pgName.UseVisualStyleBackColor = true; @@ -160,134 +160,134 @@ private void InitializeComponent() // this.groupBox1.Location = new System.Drawing.Point(16, 128); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(648, 8); + this.groupBox1.Size = new System.Drawing.Size(680, 8); this.groupBox1.TabIndex = 12; this.groupBox1.TabStop = false; // // txtSortString // - this.txtSortString.Location = new System.Drawing.Point(480, 88); + this.txtSortString.Location = new System.Drawing.Point(525, 88); this.txtSortString.Name = "txtSortString"; - this.txtSortString.Size = new System.Drawing.Size(128, 22); + this.txtSortString.Size = new System.Drawing.Size(128, 26); this.txtSortString.TabIndex = 11; // // label8 // - this.label8.Location = new System.Drawing.Point(384, 88); + this.label8.Location = new System.Drawing.Point(410, 90); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(90, 23); + this.label8.Size = new System.Drawing.Size(109, 23); this.label8.TabIndex = 10; this.label8.Text = "Sort String"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtFormattedName // - this.txtFormattedName.Location = new System.Drawing.Point(136, 184); + this.txtFormattedName.Location = new System.Drawing.Point(181, 185); this.txtFormattedName.Name = "txtFormattedName"; - this.txtFormattedName.Size = new System.Drawing.Size(336, 22); + this.txtFormattedName.Size = new System.Drawing.Size(336, 26); this.txtFormattedName.TabIndex = 16; // // label7 // - this.label7.Location = new System.Drawing.Point(5, 184); + this.label7.Location = new System.Drawing.Point(16, 187); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(125, 23); + this.label7.Size = new System.Drawing.Size(159, 23); this.label7.TabIndex = 15; this.label7.Text = "&Formatted Name"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtNickname // - this.txtNickname.Location = new System.Drawing.Point(136, 152); + this.txtNickname.Location = new System.Drawing.Point(181, 153); this.txtNickname.Name = "txtNickname"; - this.txtNickname.Size = new System.Drawing.Size(176, 22); + this.txtNickname.Size = new System.Drawing.Size(176, 26); this.txtNickname.TabIndex = 14; // // label4 // - this.label4.Location = new System.Drawing.Point(58, 152); + this.label4.Location = new System.Drawing.Point(65, 155); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(72, 23); + this.label4.Size = new System.Drawing.Size(110, 23); this.label4.TabIndex = 13; this.label4.Text = "&Nickname"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtSuffix // - this.txtSuffix.Location = new System.Drawing.Point(480, 56); + this.txtSuffix.Location = new System.Drawing.Point(525, 56); this.txtSuffix.Name = "txtSuffix"; - this.txtSuffix.Size = new System.Drawing.Size(128, 22); + this.txtSuffix.Size = new System.Drawing.Size(128, 26); this.txtSuffix.TabIndex = 9; // // label5 // - this.label5.Location = new System.Drawing.Point(418, 56); + this.label5.Location = new System.Drawing.Point(437, 58); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(56, 23); + this.label5.Size = new System.Drawing.Size(82, 23); this.label5.TabIndex = 8; this.label5.Text = "Suffix"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtTitle // - this.txtTitle.Location = new System.Drawing.Point(480, 24); + this.txtTitle.Location = new System.Drawing.Point(525, 24); this.txtTitle.Name = "txtTitle"; - this.txtTitle.Size = new System.Drawing.Size(128, 22); + this.txtTitle.Size = new System.Drawing.Size(128, 26); this.txtTitle.TabIndex = 7; // // label6 // - this.label6.Location = new System.Drawing.Point(434, 24); + this.label6.Location = new System.Drawing.Point(433, 26); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(40, 23); + this.label6.Size = new System.Drawing.Size(86, 23); this.label6.TabIndex = 6; this.label6.Text = "Title"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtMiddleName // - this.txtMiddleName.Location = new System.Drawing.Point(136, 88); + this.txtMiddleName.Location = new System.Drawing.Point(181, 88); this.txtMiddleName.Name = "txtMiddleName"; - this.txtMiddleName.Size = new System.Drawing.Size(208, 22); + this.txtMiddleName.Size = new System.Drawing.Size(208, 26); this.txtMiddleName.TabIndex = 5; // // label3 // - this.label3.Location = new System.Drawing.Point(21, 88); + this.label3.Location = new System.Drawing.Point(61, 90); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(109, 23); + this.label3.Size = new System.Drawing.Size(114, 23); this.label3.TabIndex = 4; this.label3.Text = "Middle Name"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtFirstName // - this.txtFirstName.Location = new System.Drawing.Point(136, 56); + this.txtFirstName.Location = new System.Drawing.Point(181, 56); this.txtFirstName.Name = "txtFirstName"; - this.txtFirstName.Size = new System.Drawing.Size(208, 22); + this.txtFirstName.Size = new System.Drawing.Size(208, 26); this.txtFirstName.TabIndex = 3; // // label2 // - this.label2.Location = new System.Drawing.Point(50, 56); + this.label2.Location = new System.Drawing.Point(61, 56); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 23); + this.label2.Size = new System.Drawing.Size(114, 23); this.label2.TabIndex = 2; this.label2.Text = "First Name"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtLastName // - this.txtLastName.Location = new System.Drawing.Point(136, 24); + this.txtLastName.Location = new System.Drawing.Point(181, 24); this.txtLastName.Name = "txtLastName"; - this.txtLastName.Size = new System.Drawing.Size(208, 22); + this.txtLastName.Size = new System.Drawing.Size(208, 26); this.txtLastName.TabIndex = 1; // // label1 // - this.label1.Location = new System.Drawing.Point(50, 24); + this.label1.Location = new System.Drawing.Point(61, 26); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(80, 23); + this.label1.Size = new System.Drawing.Size(114, 23); this.label1.TabIndex = 0; this.label1.Text = "&Last Name"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -295,35 +295,35 @@ private void InitializeComponent() // pgAddresses // this.pgAddresses.Controls.Add(this.ucAddresses); - this.pgAddresses.Location = new System.Drawing.Point(4, 25); + this.pgAddresses.Location = new System.Drawing.Point(4, 29); this.pgAddresses.Name = "pgAddresses"; - this.pgAddresses.Size = new System.Drawing.Size(674, 274); + this.pgAddresses.Size = new System.Drawing.Size(713, 289); this.pgAddresses.TabIndex = 1; this.pgAddresses.Text = "Addresses"; this.pgAddresses.UseVisualStyleBackColor = true; // // ucAddresses // - this.ucAddresses.Location = new System.Drawing.Point(5, 27); + this.ucAddresses.Location = new System.Drawing.Point(9, 20); this.ucAddresses.Name = "ucAddresses"; - this.ucAddresses.Size = new System.Drawing.Size(664, 220); + this.ucAddresses.Size = new System.Drawing.Size(690, 248); this.ucAddresses.TabIndex = 0; // // pgLabels // this.pgLabels.Controls.Add(this.ucLabels); - this.pgLabels.Location = new System.Drawing.Point(4, 25); + this.pgLabels.Location = new System.Drawing.Point(4, 29); this.pgLabels.Name = "pgLabels"; - this.pgLabels.Size = new System.Drawing.Size(674, 274); + this.pgLabels.Size = new System.Drawing.Size(713, 289); this.pgLabels.TabIndex = 7; this.pgLabels.Text = "Labels"; this.pgLabels.UseVisualStyleBackColor = true; // // ucLabels // - this.ucLabels.Location = new System.Drawing.Point(105, 37); + this.ucLabels.Location = new System.Drawing.Point(18, 40); this.ucLabels.Name = "ucLabels"; - this.ucLabels.Size = new System.Drawing.Size(464, 200); + this.ucLabels.Size = new System.Drawing.Size(672, 208); this.ucLabels.TabIndex = 0; // // pgPhoneEMail @@ -331,33 +331,33 @@ private void InitializeComponent() this.pgPhoneEMail.Controls.Add(this.groupBox2); this.pgPhoneEMail.Controls.Add(this.ucEMail); this.pgPhoneEMail.Controls.Add(this.ucPhones); - this.pgPhoneEMail.Location = new System.Drawing.Point(4, 25); + this.pgPhoneEMail.Location = new System.Drawing.Point(4, 29); this.pgPhoneEMail.Name = "pgPhoneEMail"; - this.pgPhoneEMail.Size = new System.Drawing.Size(674, 274); + this.pgPhoneEMail.Size = new System.Drawing.Size(713, 289); this.pgPhoneEMail.TabIndex = 3; this.pgPhoneEMail.Text = "Phone/E-Mail"; this.pgPhoneEMail.UseVisualStyleBackColor = true; // // groupBox2 // - this.groupBox2.Location = new System.Drawing.Point(8, 144); + this.groupBox2.Location = new System.Drawing.Point(9, 157); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(664, 8); + this.groupBox2.Size = new System.Drawing.Size(694, 8); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; // // ucEMail // - this.ucEMail.Location = new System.Drawing.Point(96, 159); + this.ucEMail.Location = new System.Drawing.Point(8, 173); this.ucEMail.Name = "ucEMail"; - this.ucEMail.Size = new System.Drawing.Size(472, 104); + this.ucEMail.Size = new System.Drawing.Size(689, 110); this.ucEMail.TabIndex = 2; // // ucPhones // - this.ucPhones.Location = new System.Drawing.Point(96, 8); + this.ucPhones.Location = new System.Drawing.Point(8, 8); this.ucPhones.Name = "ucPhones"; - this.ucPhones.Size = new System.Drawing.Size(472, 128); + this.ucPhones.Size = new System.Drawing.Size(689, 143); this.ucPhones.TabIndex = 0; // // pgWork @@ -374,105 +374,105 @@ private void InitializeComponent() this.pgWork.Controls.Add(this.label19); this.pgWork.Controls.Add(this.txtOrganization); this.pgWork.Controls.Add(this.label18); - this.pgWork.Location = new System.Drawing.Point(4, 25); + this.pgWork.Location = new System.Drawing.Point(4, 29); this.pgWork.Name = "pgWork"; - this.pgWork.Size = new System.Drawing.Size(674, 274); + this.pgWork.Size = new System.Drawing.Size(713, 289); this.pgWork.TabIndex = 2; this.pgWork.Text = "Work"; this.pgWork.UseVisualStyleBackColor = true; // // txtRole // - this.txtRole.Location = new System.Drawing.Point(144, 136); + this.txtRole.Location = new System.Drawing.Point(170, 137); this.txtRole.Name = "txtRole"; - this.txtRole.Size = new System.Drawing.Size(320, 22); + this.txtRole.Size = new System.Drawing.Size(320, 26); this.txtRole.TabIndex = 8; // // label22 // - this.label22.Location = new System.Drawing.Point(74, 136); + this.label22.Location = new System.Drawing.Point(71, 139); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(64, 23); + this.label22.Size = new System.Drawing.Size(93, 23); this.label22.TabIndex = 7; this.label22.Text = "Role"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // groupBox7 // - this.groupBox7.Location = new System.Drawing.Point(16, 168); + this.groupBox7.Location = new System.Drawing.Point(14, 168); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(648, 8); + this.groupBox7.Size = new System.Drawing.Size(684, 8); this.groupBox7.TabIndex = 9; this.groupBox7.TabStop = false; // // txtCategories // - this.txtCategories.Location = new System.Drawing.Point(144, 192); + this.txtCategories.Location = new System.Drawing.Point(170, 193); this.txtCategories.Name = "txtCategories"; - this.txtCategories.Size = new System.Drawing.Size(440, 22); + this.txtCategories.Size = new System.Drawing.Size(440, 26); this.txtCategories.TabIndex = 11; // // label21 // - this.label21.Location = new System.Drawing.Point(58, 192); + this.label21.Location = new System.Drawing.Point(42, 195); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(80, 23); + this.label21.Size = new System.Drawing.Size(122, 23); this.label21.TabIndex = 10; this.label21.Text = "&Categories"; this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtJobTitle // - this.txtJobTitle.Location = new System.Drawing.Point(144, 104); + this.txtJobTitle.Location = new System.Drawing.Point(170, 105); this.txtJobTitle.Name = "txtJobTitle"; - this.txtJobTitle.Size = new System.Drawing.Size(320, 22); + this.txtJobTitle.Size = new System.Drawing.Size(320, 26); this.txtJobTitle.TabIndex = 6; // // label20 // - this.label20.Location = new System.Drawing.Point(61, 104); + this.label20.Location = new System.Drawing.Point(67, 107); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(77, 23); + this.label20.Size = new System.Drawing.Size(97, 23); this.label20.TabIndex = 5; this.label20.Text = "&Job Title"; this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // groupBox6 // - this.groupBox6.Location = new System.Drawing.Point(16, 80); + this.groupBox6.Location = new System.Drawing.Point(14, 80); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(648, 8); + this.groupBox6.Size = new System.Drawing.Size(684, 8); this.groupBox6.TabIndex = 4; this.groupBox6.TabStop = false; // // txtUnits // - this.txtUnits.Location = new System.Drawing.Point(144, 48); + this.txtUnits.Location = new System.Drawing.Point(170, 48); this.txtUnits.Name = "txtUnits"; - this.txtUnits.Size = new System.Drawing.Size(440, 22); + this.txtUnits.Size = new System.Drawing.Size(440, 26); this.txtUnits.TabIndex = 3; // // label19 // - this.label19.Location = new System.Drawing.Point(90, 48); + this.label19.Location = new System.Drawing.Point(88, 50); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(48, 23); + this.label19.Size = new System.Drawing.Size(76, 23); this.label19.TabIndex = 2; this.label19.Text = "Units"; this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtOrganization // - this.txtOrganization.Location = new System.Drawing.Point(144, 16); + this.txtOrganization.Location = new System.Drawing.Point(170, 16); this.txtOrganization.Name = "txtOrganization"; - this.txtOrganization.Size = new System.Drawing.Size(320, 22); + this.txtOrganization.Size = new System.Drawing.Size(320, 26); this.txtOrganization.TabIndex = 1; // // label18 // - this.label18.Location = new System.Drawing.Point(42, 16); + this.label18.Location = new System.Drawing.Point(42, 18); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(96, 23); + this.label18.Size = new System.Drawing.Size(122, 23); this.label18.TabIndex = 0; this.label18.Text = "&Organization"; this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -496,18 +496,18 @@ private void InitializeComponent() this.pgOther.Controls.Add(this.label13); this.pgOther.Controls.Add(this.txtTimeZone); this.pgOther.Controls.Add(this.label12); - this.pgOther.Location = new System.Drawing.Point(4, 25); + this.pgOther.Location = new System.Drawing.Point(4, 29); this.pgOther.Name = "pgOther"; - this.pgOther.Size = new System.Drawing.Size(674, 274); + this.pgOther.Size = new System.Drawing.Size(713, 289); this.pgOther.TabIndex = 4; this.pgOther.Text = "Other"; this.pgOther.UseVisualStyleBackColor = true; // // btnFind // - this.btnFind.Location = new System.Drawing.Point(448, 85); + this.btnFind.Location = new System.Drawing.Point(542, 95); this.btnFind.Name = "btnFind"; - this.btnFind.Size = new System.Drawing.Size(60, 28); + this.btnFind.Size = new System.Drawing.Size(75, 28); this.btnFind.TabIndex = 9; this.btnFind.Text = "&Find"; this.btnFind.Click += new System.EventHandler(this.btnFind_Click); @@ -515,76 +515,76 @@ private void InitializeComponent() // txtComments // this.txtComments.AcceptsReturn = true; - this.txtComments.Location = new System.Drawing.Point(128, 192); + this.txtComments.Location = new System.Drawing.Point(150, 198); this.txtComments.Multiline = true; this.txtComments.Name = "txtComments"; this.txtComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtComments.Size = new System.Drawing.Size(496, 72); + this.txtComments.Size = new System.Drawing.Size(528, 72); this.txtComments.TabIndex = 16; // // label17 // - this.label17.Location = new System.Drawing.Point(42, 192); + this.label17.Location = new System.Drawing.Point(34, 200); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(80, 23); + this.label17.Size = new System.Drawing.Size(110, 23); this.label17.TabIndex = 15; this.label17.Text = "&Comments"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // groupBox5 // - this.groupBox5.Location = new System.Drawing.Point(16, 176); + this.groupBox5.Location = new System.Drawing.Point(17, 182); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(648, 8); + this.groupBox5.Size = new System.Drawing.Size(688, 8); this.groupBox5.TabIndex = 14; this.groupBox5.TabStop = false; // // btnWebPage // - this.btnWebPage.Location = new System.Drawing.Point(511, 141); + this.btnWebPage.Location = new System.Drawing.Point(542, 149); this.btnWebPage.Name = "btnWebPage"; - this.btnWebPage.Size = new System.Drawing.Size(60, 28); + this.btnWebPage.Size = new System.Drawing.Size(75, 28); this.btnWebPage.TabIndex = 13; this.btnWebPage.Text = "&Go"; this.btnWebPage.Click += new System.EventHandler(this.btnWebPage_Click); // // txtWebPage // - this.txtWebPage.Location = new System.Drawing.Point(128, 144); + this.txtWebPage.Location = new System.Drawing.Point(150, 150); this.txtWebPage.Name = "txtWebPage"; - this.txtWebPage.Size = new System.Drawing.Size(368, 22); + this.txtWebPage.Size = new System.Drawing.Size(368, 26); this.txtWebPage.TabIndex = 12; // // label16 // - this.label16.Location = new System.Drawing.Point(42, 144); + this.label16.Location = new System.Drawing.Point(34, 150); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(80, 23); + this.label16.Size = new System.Drawing.Size(110, 23); this.label16.TabIndex = 11; this.label16.Text = "&Web Page"; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // groupBox4 // - this.groupBox4.Location = new System.Drawing.Point(16, 120); + this.groupBox4.Location = new System.Drawing.Point(17, 126); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(648, 8); + this.groupBox4.Size = new System.Drawing.Size(688, 8); this.groupBox4.TabIndex = 10; this.groupBox4.TabStop = false; // // groupBox3 // - this.groupBox3.Location = new System.Drawing.Point(16, 40); + this.groupBox3.Location = new System.Drawing.Point(17, 46); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(648, 8); + this.groupBox3.Size = new System.Drawing.Size(688, 8); this.groupBox3.TabIndex = 2; this.groupBox3.TabStop = false; // // label15 // - this.label15.Location = new System.Drawing.Point(45, 8); + this.label15.Location = new System.Drawing.Point(38, 14); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(77, 23); + this.label15.Size = new System.Drawing.Size(106, 23); this.label15.TabIndex = 0; this.label15.Text = "&Birth Date"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -594,56 +594,56 @@ private void InitializeComponent() this.dtpBirthDate.Checked = false; this.dtpBirthDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt"; this.dtpBirthDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpBirthDate.Location = new System.Drawing.Point(128, 8); + this.dtpBirthDate.Location = new System.Drawing.Point(150, 14); this.dtpBirthDate.Name = "dtpBirthDate"; this.dtpBirthDate.ShowCheckBox = true; - this.dtpBirthDate.Size = new System.Drawing.Size(210, 22); + this.dtpBirthDate.Size = new System.Drawing.Size(255, 26); this.dtpBirthDate.TabIndex = 1; // // txtLongitude // - this.txtLongitude.Location = new System.Drawing.Point(328, 88); + this.txtLongitude.Location = new System.Drawing.Point(398, 96); this.txtLongitude.Name = "txtLongitude"; - this.txtLongitude.Size = new System.Drawing.Size(104, 22); + this.txtLongitude.Size = new System.Drawing.Size(120, 26); this.txtLongitude.TabIndex = 8; // // label14 // - this.label14.Location = new System.Drawing.Point(250, 88); + this.label14.Location = new System.Drawing.Point(290, 98); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(72, 23); + this.label14.Size = new System.Drawing.Size(102, 23); this.label14.TabIndex = 7; this.label14.Text = "Longitude"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtLatitude // - this.txtLatitude.Location = new System.Drawing.Point(128, 88); + this.txtLatitude.Location = new System.Drawing.Point(150, 96); this.txtLatitude.Name = "txtLatitude"; - this.txtLatitude.Size = new System.Drawing.Size(104, 22); + this.txtLatitude.Size = new System.Drawing.Size(120, 26); this.txtLatitude.TabIndex = 6; // // label13 // - this.label13.Location = new System.Drawing.Point(58, 88); + this.label13.Location = new System.Drawing.Point(51, 96); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(64, 23); + this.label13.Size = new System.Drawing.Size(93, 23); this.label13.TabIndex = 5; this.label13.Text = "&Latitude"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtTimeZone // - this.txtTimeZone.Location = new System.Drawing.Point(128, 56); + this.txtTimeZone.Location = new System.Drawing.Point(150, 64); this.txtTimeZone.Name = "txtTimeZone"; - this.txtTimeZone.Size = new System.Drawing.Size(304, 22); + this.txtTimeZone.Size = new System.Drawing.Size(368, 26); this.txtTimeZone.TabIndex = 4; // // label12 // - this.label12.Location = new System.Drawing.Point(42, 56); + this.label12.Location = new System.Drawing.Point(34, 66); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(80, 23); + this.label12.Size = new System.Drawing.Size(110, 23); this.label12.TabIndex = 3; this.label12.Text = "&Time Zone"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -651,9 +651,9 @@ private void InitializeComponent() // pgPhoto // this.pgPhoto.Controls.Add(this.ucPhoto); - this.pgPhoto.Location = new System.Drawing.Point(4, 25); + this.pgPhoto.Location = new System.Drawing.Point(4, 29); this.pgPhoto.Name = "pgPhoto"; - this.pgPhoto.Size = new System.Drawing.Size(674, 274); + this.pgPhoto.Size = new System.Drawing.Size(713, 289); this.pgPhoto.TabIndex = 5; this.pgPhoto.Text = "Photo"; this.pgPhoto.UseVisualStyleBackColor = true; @@ -661,7 +661,8 @@ private void InitializeComponent() // ucPhoto // this.ucPhoto.Cursor = System.Windows.Forms.Cursors.Default; - this.ucPhoto.Location = new System.Drawing.Point(8, 33); + this.ucPhoto.ImageType = null; + this.ucPhoto.Location = new System.Drawing.Point(22, 40); this.ucPhoto.Name = "ucPhoto"; this.ucPhoto.Size = new System.Drawing.Size(664, 208); this.ucPhoto.TabIndex = 0; @@ -669,9 +670,9 @@ private void InitializeComponent() // pgLogo // this.pgLogo.Controls.Add(this.ucLogo); - this.pgLogo.Location = new System.Drawing.Point(4, 25); + this.pgLogo.Location = new System.Drawing.Point(4, 29); this.pgLogo.Name = "pgLogo"; - this.pgLogo.Size = new System.Drawing.Size(674, 274); + this.pgLogo.Size = new System.Drawing.Size(713, 289); this.pgLogo.TabIndex = 6; this.pgLogo.Text = "Logo"; this.pgLogo.UseVisualStyleBackColor = true; @@ -679,7 +680,8 @@ private void InitializeComponent() // ucLogo // this.ucLogo.Cursor = System.Windows.Forms.Cursors.Default; - this.ucLogo.Location = new System.Drawing.Point(8, 33); + this.ucLogo.ImageType = null; + this.ucLogo.Location = new System.Drawing.Point(22, 40); this.ucLogo.Name = "ucLogo"; this.ucLogo.Size = new System.Drawing.Size(664, 208); this.ucLogo.TabIndex = 0; @@ -687,7 +689,7 @@ private void InitializeComponent() // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(12, 381); + this.btnOK.Location = new System.Drawing.Point(12, 424); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(88, 32); this.btnOK.TabIndex = 9; @@ -697,7 +699,7 @@ private void InitializeComponent() // this.btnCancel.CausesValidation = false; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(606, 381); + this.btnCancel.Location = new System.Drawing.Point(645, 424); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(88, 32); this.btnCancel.TabIndex = 10; @@ -705,18 +707,18 @@ private void InitializeComponent() // // txtUniqueId // - this.txtUniqueId.Location = new System.Drawing.Point(88, 12); + this.txtUniqueId.Location = new System.Drawing.Point(115, 12); this.txtUniqueId.Name = "txtUniqueId"; this.txtUniqueId.ReadOnly = true; - this.txtUniqueId.Size = new System.Drawing.Size(376, 22); + this.txtUniqueId.Size = new System.Drawing.Size(376, 26); this.txtUniqueId.TabIndex = 1; this.txtUniqueId.TabStop = false; // // label9 // - this.label9.Location = new System.Drawing.Point(10, 12); + this.label9.Location = new System.Drawing.Point(12, 14); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(72, 23); + this.label9.Size = new System.Drawing.Size(97, 23); this.label9.TabIndex = 0; this.label9.Text = "Unique ID"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -724,55 +726,56 @@ private void InitializeComponent() // txtClass // this.txtClass.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.txtClass.Location = new System.Drawing.Point(544, 42); + this.txtClass.Location = new System.Drawing.Point(584, 46); this.txtClass.Name = "txtClass"; - this.txtClass.Size = new System.Drawing.Size(144, 22); + this.txtClass.Size = new System.Drawing.Size(145, 26); this.txtClass.TabIndex = 7; // // label10 // - this.label10.Location = new System.Drawing.Point(490, 42); + this.label10.Location = new System.Drawing.Point(500, 48); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(48, 23); + this.label10.Size = new System.Drawing.Size(78, 23); this.label10.TabIndex = 6; this.label10.Text = "Class"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // txtLastRevised // - this.txtLastRevised.Location = new System.Drawing.Point(88, 42); + this.txtLastRevised.Location = new System.Drawing.Point(115, 46); this.txtLastRevised.Name = "txtLastRevised"; this.txtLastRevised.ReadOnly = true; - this.txtLastRevised.Size = new System.Drawing.Size(168, 22); + this.txtLastRevised.Size = new System.Drawing.Size(207, 26); this.txtLastRevised.TabIndex = 5; this.txtLastRevised.TabStop = false; // // label11 // - this.label11.Location = new System.Drawing.Point(18, 42); + this.label11.Location = new System.Drawing.Point(16, 48); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(64, 23); + this.label11.Size = new System.Drawing.Size(93, 23); this.label11.TabIndex = 4; this.label11.Text = "Revised"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label23 // - this.label23.Location = new System.Drawing.Point(474, 12); + this.label23.Location = new System.Drawing.Point(498, 14); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(64, 23); + this.label23.Size = new System.Drawing.Size(80, 23); this.label23.TabIndex = 2; this.label23.Text = "&Version"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // cboVersion // + this.cboVersion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboVersion.Items.AddRange(new object[] { "2.1", "3.0"}); - this.cboVersion.Location = new System.Drawing.Point(544, 12); + this.cboVersion.Location = new System.Drawing.Point(584, 12); this.cboVersion.Name = "cboVersion"; - this.cboVersion.Size = new System.Drawing.Size(56, 24); + this.cboVersion.Size = new System.Drawing.Size(65, 28); this.cboVersion.TabIndex = 3; this.cboVersion.SelectedIndexChanged += new System.EventHandler(this.cboVersion_SelectedIndexChanged); // @@ -784,7 +787,7 @@ private void InitializeComponent() // this.AcceptButton = this.btnOK; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(706, 425); + this.ClientSize = new System.Drawing.Size(745, 468); this.Controls.Add(this.cboVersion); this.Controls.Add(this.label23); this.Controls.Add(this.txtLastRevised); diff --git a/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.cs b/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.cs index a49691e..b6addec 100644 --- a/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.cs +++ b/Source/CSharpDemos/vCardBrowser/VCardPropertiesDlg.cs @@ -2,8 +2,8 @@ // System : EWSoftware PDI Demonstration Applications // File : VCardPropertiesDlg.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/27/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to edit a vCard's properties. It supports most of the common properties of the vCard including @@ -50,7 +50,7 @@ public VCardPropertiesDlg() // Set the short date/long time pattern based on the current culture dtpBirthDate.CustomFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " " + - CultureInfo.CurrentCulture.DateTimeFormat.LongTimePattern; + CultureInfo.CurrentCulture.DateTimeFormat.LongTimePattern; } #endregion @@ -128,8 +128,6 @@ private void btnWebPage_Click(object sender, EventArgs e) /// The event parameters private void VCardPropertiesDlg_Closing(object sender, CancelEventArgs e) { - double latitude, longitude; - // Ignore on cancel if(this.DialogResult == DialogResult.Cancel) return; @@ -137,19 +135,19 @@ private void VCardPropertiesDlg_Closing(object sender, CancelEventArgs e) epErrors.Clear(); if(txtLatitude.Text.Trim().Length != 0) - if(!Double.TryParse(txtLatitude.Text, out latitude) || latitude < -90.0 || latitude > 90.0) + if(!Double.TryParse(txtLatitude.Text, out double latitude) || latitude < -90.0 || latitude > 90.0) { e.Cancel = true; - epErrors.SetError(txtLatitude, "Latitude must be a valid numeric value between -90 and 90"); + epErrors.SetError(txtLatitude, "Latitude must be a valid decimal value between -90 and 90"); tabInfo.SelectedTab = pgOther; txtLatitude.Focus(); } if(txtLongitude.Text.Trim().Length != 0) - if(!Double.TryParse(txtLongitude.Text, out longitude) || longitude < -180.0 || longitude > 180.0) + if(!Double.TryParse(txtLongitude.Text, out double longitude) || longitude < -180.0 || longitude > 180.0) { e.Cancel = true; - epErrors.SetError(txtLongitude, "Longitude must be a valid numeric value between -180 and 180"); + epErrors.SetError(txtLongitude, "Longitude must be a valid decimal value between -180 and 180"); tabInfo.SelectedTab = pgOther; txtLongitude.Focus(); } diff --git a/Source/Common.vsspell b/Source/Common.vsspell new file mode 100644 index 0000000..3e58997 --- /dev/null +++ b/Source/Common.vsspell @@ -0,0 +1,26 @@ + + + + True + + True + + True + True + True + + *.ics + *.vcf + + True + + iso + vcalendar + vcard + xml + ics + vcf + vcs + + \ No newline at end of file diff --git a/Source/EWSPDI.sln b/Source/EWSPDI.sln index 16891ef..1bf2aaf 100644 --- a/Source/EWSPDI.sln +++ b/Source/EWSPDI.sln @@ -5,7 +5,9 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5282D624-0EA3-4F39-939A-E5DFB8EAF3A8}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + Common.vsspell = Common.vsspell EWSPDI.ruleset = EWSPDI.ruleset + EWSPDI.sln.vsspell = EWSPDI.sln.vsspell EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EWSoftware.PDI", "EWSPDI\EWSoftware.PDI.csproj", "{FAB2E594-F7C2-4677-99F6-6F9717174DA3}" diff --git a/Source/EWSPDI.sln.vsspell b/Source/EWSPDI.sln.vsspell new file mode 100644 index 0000000..bc2788d --- /dev/null +++ b/Source/EWSPDI.sln.vsspell @@ -0,0 +1,14 @@ + + + + True + + True + True + True + Common.vsspell + True + + True + \ No newline at end of file diff --git a/Source/EWSPDI/DateUtils.cs b/Source/EWSPDI/DateUtils.cs index e928b63..79b2ccb 100644 --- a/Source/EWSPDI/DateUtils.cs +++ b/Source/EWSPDI/DateUtils.cs @@ -2,7 +2,7 @@ // System : Personal Data Interchange Classes // File : DateUtils.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/15/2018 +// Updated : 11/22/2018 // Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -240,7 +240,7 @@ public static DateTime CalculateFloatingDate(int year, int month, DayOccurrence DateTime dtDate; if(occur == DayOccurrence.None) - throw new ArgumentException(LR.GetString("ExDUOccurIsNone"), "occur"); + throw new ArgumentException(LR.GetString("ExDUOccurIsNone"), nameof(occur)); // Calculating a specific occurrence or the last one? if(occur != DayOccurrence.Last) @@ -313,7 +313,7 @@ public static DateTime CalculateOccurrenceDate(int year, int month, DayOccurrenc int count = 0, occurrence = (int)occur; if(occur == DayOccurrence.None) - throw new ArgumentException(LR.GetString("ExDUOccurIsNone"), "occur"); + throw new ArgumentException(LR.GetString("ExDUOccurIsNone"), nameof(occur)); // Calculating a specific occurrence or the last one? if(occur != DayOccurrence.Last) @@ -465,7 +465,7 @@ public static DateTime DateFromWeek(int year, int week, DayOfWeek dow, int offse // Validate week number if(week < 1 || week > 53) - throw new ArgumentOutOfRangeException("week", week, LR.GetString("ExDUBadWeekNumber")); + throw new ArgumentOutOfRangeException(nameof(week), week, LR.GetString("ExDUBadWeekNumber")); // Bit of a hack but if you're looking for dates this far out, I'd like to know what the hell you're // doing. @@ -591,10 +591,10 @@ public static DateTime EasterSunday(int year, EasterMethod method) // Validate year if(method == EasterMethod.Julian && year < 326) - throw new ArgumentOutOfRangeException("year", year, LR.GetString("ExDUBadJulianYear")); + throw new ArgumentOutOfRangeException(nameof(year), year, LR.GetString("ExDUBadJulianYear")); if(method != EasterMethod.Julian && (year < 1583 || year > 4099)) - throw new ArgumentOutOfRangeException("year", year, LR.GetString("ExDUBadOrthGregYear")); + throw new ArgumentOutOfRangeException(nameof(year), year, LR.GetString("ExDUBadOrthGregYear")); century = year / 100; // Get century yearRem = year % 19; // Get remainder of year / 19 @@ -703,7 +703,7 @@ public static DateTime EasterSunday(int year, EasterMethod method) /// value. /// The specified string converted to a local date/time /// This is thrown if the specified date/time string is not valid - /// The method is capable of parsing a string + /// The method is capable of parsing a string /// in a very specific layout of the ISO 8601 format (SortableDateTimePattern). However, if the string /// deviates even slightly from that pattern, it cannot be parsed. This method takes an ISO 8601 /// formatted date string in any of various formats and returns the DateTime value that it represents. @@ -724,7 +724,7 @@ public static DateTime FromISO8601String(string dateTimeText, bool toLocalTime) Match m = reISO8601.Match(dateTimeText); if(!m.Success) - throw new ArgumentException(LR.GetString("ExDUBadISOFormat"), "dateTimeText"); + throw new ArgumentException(LR.GetString("ExDUBadISOFormat"), nameof(dateTimeText)); // Day parts must be there year = Convert.ToInt32(m.Groups["Year"].Value, CultureInfo.InvariantCulture); @@ -813,7 +813,7 @@ public static bool IsFloatingFormat(string dateTimeText) Match m = reISO8601.Match(dateTimeText); if(!m.Success) - throw new ArgumentException(LR.GetString("ExDUBadISOFormat"), "dateTimeText"); + throw new ArgumentException(LR.GetString("ExDUBadISOFormat"), nameof(dateTimeText)); if(m.Groups["Zulu"].Value.Length != 0 || m.Groups["TZHours"].Value.Length != 0) return false; @@ -838,7 +838,7 @@ public static TimeSpan FromISO8601TimeZone(string timeZone) Match m = reTimeZone.Match(timeZone); if(!m.Success) - throw new ArgumentException(LR.GetString("ExDUBadISOTZFormat"), "timeZone"); + throw new ArgumentException(LR.GetString("ExDUBadISOTZFormat"), nameof(timeZone)); // Hour must be there, minutes are optional hour = Convert.ToInt32(m.Groups["TZHours"].Value, CultureInfo.InvariantCulture); diff --git a/Source/EWSPDI/DayInstance.cs b/Source/EWSPDI/DayInstance.cs index e492f24..b8dd2a5 100644 --- a/Source/EWSPDI/DayInstance.cs +++ b/Source/EWSPDI/DayInstance.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : DayInstance.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to specify day instances for the BYDAY rule of a recurrence object. The class @@ -40,7 +40,7 @@ public class DayInstance : ISerializable // This is used to convert the instance to its string form. This is convenient for generating its // iCalendar representation. - private static string[] abbrevDays = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; + private static readonly string[] abbrevDays = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; private int instance; private DayOfWeek dow; @@ -61,13 +61,13 @@ public class DayInstance : ISerializable /// or greater than 53. public int Instance { - get { return instance; } + get => instance; set { // The spec doesn't say it, but you can imply that you can't have a value higher than 53 as these // do roughly correspond to week numbers. if(value < -53 || value > 53) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExDIBadInstanceValue")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExDIBadInstanceValue")); instance = value; } @@ -78,11 +78,11 @@ public int Instance /// public DayOfWeek DayOfWeek { - get { return dow; } + get => dow; set { if(!Enum.IsDefined(typeof(DayOfWeek), value)) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExDIInvalidDayOfWeek")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExDIInvalidDayOfWeek")); dow = value; } @@ -152,9 +152,7 @@ protected DayInstance(SerializationInfo info, StreamingContext context) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - DayInstance d = obj as DayInstance; - - if(d == null) + if(!(obj is DayInstance d)) return false; return (this == d || (this.Instance == d.Instance && this.DayOfWeek == d.DayOfWeek)); @@ -179,8 +177,7 @@ public override string ToString() if(this.Instance == 0) return abbrevDays[(int)this.DayOfWeek]; - return String.Format(CultureInfo.InvariantCulture, "{0}{1}", this.Instance, - abbrevDays[(int)this.DayOfWeek]); + return $"{this.Instance}{abbrevDays[(int)this.DayOfWeek]}"; } /// @@ -192,16 +189,12 @@ public string ToDescription() string suffix = DayInstance.NumericSuffix(instance); if(instance == 0) - return String.Format(CultureInfo.InvariantCulture, "{0} {1}", LR.GetString("DIAny"), - CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dow]); + return $"{LR.GetString("DIAny")} {CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dow]}"; if(instance < 0) - return String.Format(CultureInfo.InvariantCulture, "{0}{1} {2} {3}", instance * -1, - suffix, CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dow], - LR.GetString("DIFromEnd")); + return $"{instance * -1}{suffix} {CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dow]} {LR.GetString("DIFromEnd")}"; - return String.Format(CultureInfo.InvariantCulture, "{0}{1} {2}", instance, suffix, - CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dow]); + return $"{instance}{suffix} {CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dow]}"; } /// diff --git a/Source/EWSPDI/Duration.cs b/Source/EWSPDI/Duration.cs index 8143565..12f5633 100644 --- a/Source/EWSPDI/Duration.cs +++ b/Source/EWSPDI/Duration.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : Duration.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class that represents a duration. It contains a TimeSpan object and adds support for @@ -110,8 +110,8 @@ public enum MaxUnit [XmlIgnore] public static double DaysInOneMonth { - get { return daysInMonth; } - set { daysInMonth = value; } + get => daysInMonth; + set => daysInMonth = value; } /// @@ -123,33 +123,21 @@ public static double DaysInOneMonth [XmlIgnore] public static double DaysInOneYear { - get { return daysInYear; } - set { daysInYear = value; } + get => daysInYear; + set => daysInYear = value; } /// /// This returns the number of timer ticks in one month based on the current setting of /// . /// - public static long TicksPerMonth - { - get - { - return (long)(TimeSpan.TicksPerDay * Duration.DaysInOneMonth); - } - } + public static long TicksPerMonth => (long)(TimeSpan.TicksPerDay * Duration.DaysInOneMonth); /// /// This returns the number of timer ticks in one year based on the current setting of /// . /// - public static long TicksPerYear - { - get - { - return (long)(TimeSpan.TicksPerDay * Duration.DaysInOneYear); - } - } + public static long TicksPerYear => (long)(TimeSpan.TicksPerDay * Duration.DaysInOneYear); /// /// This allows access to the underlying object @@ -157,8 +145,8 @@ public static long TicksPerYear [XmlIgnore] public TimeSpan TimeSpan { - get { return ts; } - set { ts = value; } + get => ts; + set => ts = value; } /// @@ -166,8 +154,8 @@ public TimeSpan TimeSpan /// public long Ticks { - get { return ts.Ticks; } - set { ts = new TimeSpan(value); } + get => ts.Ticks; + set => ts = new TimeSpan(value); } /// @@ -175,58 +163,38 @@ public long Ticks /// /// Note that this returns the number of whole days in the duration rather than /// the number of whole days in the underlying time span. - public int Days - { - get { return (int)(ts.TotalDays % Duration.DaysInOneYear % Duration.DaysInOneMonth % 7); } - } + public int Days => (int)(ts.TotalDays % Duration.DaysInOneYear % Duration.DaysInOneMonth % 7); /// /// Gets the number of whole weeks represented by this instance /// - public int Weeks - { - get { return (int)(ts.TotalDays % Duration.DaysInOneYear % Duration.DaysInOneMonth / 7); } - } + public int Weeks => (int)(ts.TotalDays % Duration.DaysInOneYear % Duration.DaysInOneMonth / 7); /// /// Gets the number of whole months represented by this instance /// - public int Months - { - get { return (int)(ts.TotalDays % Duration.DaysInOneYear / Duration.DaysInOneMonth); } - } + public int Months => (int)(ts.TotalDays % Duration.DaysInOneYear / Duration.DaysInOneMonth); /// /// Gets the number of whole years represented by this instance /// - public int Years - { - get { return (int)(ts.TotalDays / Duration.DaysInOneYear); } - } + public int Years => (int)(ts.TotalDays / Duration.DaysInOneYear); /// /// Gets the value of this instance expressed in whole and fractional weeks /// - public double TotalWeeks - { - get { return ts.TotalDays / 7; } - } + public double TotalWeeks => ts.TotalDays / 7; /// /// Gets the value of this instance expressed in whole and fractional months /// - public double TotalMonths - { - get { return ts.TotalDays / Duration.DaysInOneMonth; } - } + public double TotalMonths => ts.TotalDays / Duration.DaysInOneMonth; /// /// Gets the value of this instance expressed in whole and fractional years /// - public double TotalYears - { - get { return ts.TotalDays / Duration.DaysInOneYear; } - } + public double TotalYears => ts.TotalDays / Duration.DaysInOneYear; + #endregion #region Constructors @@ -310,7 +278,7 @@ public Duration(string duration) Match m = reDuration.Match(duration); if(!m.Success) - throw new ArgumentException(LR.GetString("ExDurBadISOFormat"), "duration"); + throw new ArgumentException(LR.GetString("ExDurBadISOFormat"), nameof(duration)); if(m.Groups["Years"].Value.Length != 0) years = Convert.ToInt32(m.Groups["Years"].Value, CultureInfo.InvariantCulture); @@ -427,12 +395,6 @@ public static bool TryParse(string duration, out Duration result) /// Returns true if the durations are equal, false if they are not public static bool Equals(Duration d1, Duration d2) { - if((object)d1 == null && (object)d2 == null) - return true; - - if((object)d1 == null) - return false; - return d1.Equals(d2); } @@ -777,16 +739,6 @@ public int CompareTo(object obj) /// first instance is greater than the second. public static int Compare(Duration d1, Duration d2) { - // Cast as object for null checks or it goes recursive - if((object)d1 == null && (object)d2 == null) - return 0; - - if((object)d1 != null && (object)d2 == null) - return 1; - - if((object)d1 == null && (object)d2 != null) - return -1; - if(d1.TimeSpan.Ticks > d2.TimeSpan.Ticks) return 1; diff --git a/Source/EWSPDI/EWSoftware.PDI.csproj b/Source/EWSPDI/EWSoftware.PDI.csproj index 8276ee7..a7d6e99 100644 --- a/Source/EWSPDI/EWSoftware.PDI.csproj +++ b/Source/EWSPDI/EWSoftware.PDI.csproj @@ -9,8 +9,8 @@ EWSoftware PDI Library Copyright (c) 2003-2018, Eric Woodruff, All Rights Reserved en - 2018.11.17.0 - 18.11.17.0 + 2018.12.1.0 + 18.12.11.0 This library contains the core set of useful Personal Data Interchange (PDI) and date utility classes for .NET applications. They can be used for calculating holiday dates, recurrences, etc. See the project website for the code, a help file, and demos. Eric Woodruff https://raw.githubusercontent.com/EWSoftware/PDI/master/EWSPDI.png diff --git a/Source/EWSPDI/EWSoftware.PDI.csproj.vsspell b/Source/EWSPDI/EWSoftware.PDI.csproj.vsspell new file mode 100644 index 0000000..a35e17e --- /dev/null +++ b/Source/EWSPDI/EWSoftware.PDI.csproj.vsspell @@ -0,0 +1,17 @@ + + + + True + + True + + True + + nd + Mins + + True + True + True + \ No newline at end of file diff --git a/Source/EWSPDI/Expand.cs b/Source/EWSPDI/Expand.cs index f109038..b6a8bee 100644 --- a/Source/EWSPDI/Expand.cs +++ b/Source/EWSPDI/Expand.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : Expand.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a static class containing recurrence expansion methods @@ -54,8 +54,7 @@ public static int ByMonthDay(Recurrence r, RecurDateTimeCollection dates) for(expIdx = 0; expIdx < byMonthDay.Count; expIdx++) { monthDay = byMonthDay[expIdx]; - rdtNew = new RecurDateTime(rdt); - rdtNew.Day = 1; + rdtNew = new RecurDateTime(rdt) { Day = 1 }; // From start of month or end of month? if(monthDay > 0) @@ -111,8 +110,8 @@ public static int ByDayInMonths(Recurrence r, RecurDateTimeCollection dates) { // Expand to every specified day of the week // in the month. - rdtNew = new RecurDateTime(rdt); - rdtNew.Day = 1; + rdtNew = new RecurDateTime(rdt) { Day = 1 }; + rdtNew.AddDays(((int)dow + 7 - (int)rdtNew.DayOfWeek) % 7); while(rdtNew.Year == rdt.Year && rdtNew.Month == rdt.Month) @@ -127,16 +126,16 @@ public static int ByDayInMonths(Recurrence r, RecurDateTimeCollection dates) if(instance > 0) { // Add the nth instance of the day of the week - rdtNew = new RecurDateTime(rdt); - rdtNew.Day = 1; + rdtNew = new RecurDateTime(rdt) { Day = 1 }; + rdtNew.AddDays((((int)dow + 7 - (int)rdtNew.DayOfWeek) % 7) + ((instance - 1) * 7)); } else { // Add the nth instance of the day of the week // from the end of the month. - rdtNew = new RecurDateTime(rdt); - rdtNew.Day = DateTime.DaysInMonth(rdt.Year, rdt.Month + 1); + rdtNew = new RecurDateTime(rdt) { Day = DateTime.DaysInMonth(rdt.Year, rdt.Month + 1) }; + rdtNew.AddDays(0 - (((int)rdtNew.DayOfWeek + 7 - (int)dow) % 7) + ((instance + 1) * 7)); } @@ -221,8 +220,8 @@ public static int ByHour(Recurrence r, RecurDateTimeCollection dates) // Expand the date/time by adding a new entry for each hour specified for(expIdx = 0; expIdx < byHour.Count; expIdx++) { - rdtNew = new RecurDateTime(rdt); - rdtNew.Hour = byHour[expIdx]; + rdtNew = new RecurDateTime(rdt) { Hour = byHour[expIdx] }; + dates.Add(rdtNew); } } @@ -259,8 +258,8 @@ public static int ByMinute(Recurrence r, RecurDateTimeCollection dates) // Expand the date/time by adding a new entry for each minute specified for(expIdx = 0; expIdx < byMinute.Count; expIdx++) { - rdtNew = new RecurDateTime(rdt); - rdtNew.Minute = byMinute[expIdx]; + rdtNew = new RecurDateTime(rdt) { Minute = byMinute[expIdx] }; + dates.Add(rdtNew); } } @@ -297,8 +296,8 @@ public static int BySecond(Recurrence r, RecurDateTimeCollection dates) // Expand the date/time by adding a new entry for each second specified for(expIdx = 0; expIdx < bySecond.Count; expIdx++) { - rdtNew = new RecurDateTime(rdt); - rdtNew.Second = bySecond[expIdx]; + rdtNew = new RecurDateTime(rdt) { Second = bySecond[expIdx] }; + dates.Add(rdtNew); } } diff --git a/Source/EWSPDI/FixedHoliday.cs b/Source/EWSPDI/FixedHoliday.cs index 80f4acb..d84fb3f 100644 --- a/Source/EWSPDI/FixedHoliday.cs +++ b/Source/EWSPDI/FixedHoliday.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : FixedHolidays.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to automatically calculate fixed holidays. The class is serializable. @@ -60,7 +60,7 @@ public class FixedHoliday : Holiday, ISerializable [XmlAttribute] public override int Month { - get { return base.Month; } + get => base.Month; set { base.Month = value; @@ -82,13 +82,13 @@ public override int Month [XmlAttribute] public int Day { - get { return dayOfMonth; } + get => dayOfMonth; set { // Validate the day for the current month. Yes, hard-coded non-leap year. We don't allow a Feb // 29th as they don't occur every year. if(DateTime.DaysInMonth(2003, this.Month) < value) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExHolBadDayValueForMonth")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExHolBadDayValueForMonth")); dayOfMonth = value; convertYear = 0; @@ -105,7 +105,7 @@ public int Day [XmlAttribute] public bool AdjustFixedDate { - get { return adjustFixed; } + get => adjustFixed; set { adjustFixed = value; @@ -207,9 +207,7 @@ public override DateTime ToDateTime(int year) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - FixedHoliday h = obj as FixedHoliday; - - if(h == null) + if(!(obj is FixedHoliday h)) return false; return (this == h || (this.Month == h.Month && dayOfMonth == h.Day && diff --git a/Source/EWSPDI/FloatingHoliday.cs b/Source/EWSPDI/FloatingHoliday.cs index 1c71e56..fc25dd3 100644 --- a/Source/EWSPDI/FloatingHoliday.cs +++ b/Source/EWSPDI/FloatingHoliday.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : FloatingHolidays.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to automatically calculate floating holidays. The class is serializable. @@ -62,11 +62,11 @@ public class FloatingHoliday : Holiday, ISerializable [XmlAttribute] public DayOccurrence Occurrence { - get { return holidayOccurrence; } + get => holidayOccurrence; set { if(value == DayOccurrence.None) - throw new ArgumentException(LR.GetString("ExDUOccurIsNone"), "value"); + throw new ArgumentException(LR.GetString("ExDUOccurIsNone"), nameof(value)); holidayOccurrence = value; convertYear = 0; @@ -80,7 +80,7 @@ public DayOccurrence Occurrence [XmlAttribute] public DayOfWeek Weekday { - get { return dayOfWeek; } + get => dayOfWeek; set { dayOfWeek = value; @@ -106,7 +106,7 @@ public DayOfWeek Weekday [XmlAttribute] public int Offset { - get { return holidayOffset; } + get => holidayOffset; set { holidayOffset = value; @@ -206,9 +206,7 @@ public override DateTime ToDateTime(int year) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - FloatingHoliday h = obj as FloatingHoliday; - - if(h == null) + if(!(obj is FloatingHoliday h)) return false; return (this == h || (this.Month == h.Month && dayOfWeek == h.Weekday && diff --git a/Source/EWSPDI/Holiday.cs b/Source/EWSPDI/Holiday.cs index 415f324..1102ade 100644 --- a/Source/EWSPDI/Holiday.cs +++ b/Source/EWSPDI/Holiday.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : Holidays.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains an abstract base classes used to automatically calculate holiday dates @@ -48,11 +48,11 @@ public abstract class Holiday : ICloneable [XmlAttribute] public virtual int Month { - get { return holidayMonth; } + get => holidayMonth; set { if(value < 1 || value > 12) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExHolBadMonthValue")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExHolBadMonthValue")); holidayMonth = value; } diff --git a/Source/EWSPDI/ISO8601Format.cs b/Source/EWSPDI/ISO8601Format.cs index 9e71255..a070ec5 100644 --- a/Source/EWSPDI/ISO8601Format.cs +++ b/Source/EWSPDI/ISO8601Format.cs @@ -18,6 +18,8 @@ // 08/18/2003 EFW Created the code //=============================================================================================================== +// Ignore Spelling: utc + namespace EWSoftware.PDI { /// diff --git a/Source/EWSPDI/LocalizedResources.cs b/Source/EWSPDI/LocalizedResources.cs index 519cb14..b223d20 100644 --- a/Source/EWSPDI/LocalizedResources.cs +++ b/Source/EWSPDI/LocalizedResources.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : LocalizedResources.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains some internal classes used to manage the localized resources for the assembly @@ -41,7 +41,7 @@ internal static class LR private static ResourceManager rm; // This is a helper object used to quickly lock the class when creating the resource manager - private static object syncRoot = new Object(); + private static readonly object syncRoot = new Object(); #endregion @@ -63,10 +63,7 @@ private static ResourceManager Resources { Assembly asm = Assembly.GetExecutingAssembly(); - string baseName = String.Format(CultureInfo.CurrentCulture, "{0}.{1}", - asm.GetName().Name, ResourcesKey); - - rm = new ResourceManager(baseName, asm); + rm = new ResourceManager($"{asm.GetName().Name}.{ResourcesKey}", asm); } } } @@ -90,7 +87,7 @@ internal static string GetString(string name) string s = Resources.GetString(name, null); if(s == null) - s = String.Format(CultureInfo.CurrentCulture, "[?:{0}]", name); + s = $"[?:{name}]"; return s; } diff --git a/Source/EWSPDI/Period.cs b/Source/EWSPDI/Period.cs index 79a0ac3..b90ab95 100644 --- a/Source/EWSPDI/Period.cs +++ b/Source/EWSPDI/Period.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : Period.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class that represents a period of time @@ -71,8 +71,8 @@ public enum PeriodFormat /// The property is updated automatically based on the new value public Duration Duration { - get { return new Duration(this.EndDateTime - this.StartDateTime); } - set { this.EndDateTime = this.StartDateTime + value.TimeSpan; } + get => new Duration(this.EndDateTime - this.StartDateTime); + set => this.EndDateTime = this.StartDateTime + value.TimeSpan; } /// @@ -160,7 +160,7 @@ public Period(string period) string[] parts = period.Split('/'); if(parts.Length != 2) - throw new ArgumentException(LR.GetString("ExPeriodInvalidISOFormat"), "period"); + throw new ArgumentException(LR.GetString("ExPeriodInvalidISOFormat"), nameof(period)); this.StartDateTime = DateUtils.FromISO8601String(parts[0], true); @@ -221,10 +221,10 @@ public static bool TryParse(string period, out Period result) /// Returns true if the periods are equal, false if they are not public static bool Equals(Period p1, Period p2) { - if((object)p1 == null && (object)p2 == null) + if(p1 is null && p2 is null) return true; - if((object)p1 == null) + if(p1 is null) return false; return p1.Equals(p2); @@ -289,9 +289,7 @@ public override string ToString() /// Period. public int CompareTo(object obj) { - Period p = obj as Period; - - if(p == null) + if(!(obj is Period p)) throw new ArgumentException(LR.GetString("ExPeriodBadCompareObject")); return Period.Compare(this, p); @@ -306,14 +304,13 @@ public int CompareTo(object obj) /// first instance is greater than the second. public static int Compare(Period p1, Period p2) { - // Cast as object for null checks or it goes recursive - if((object)p1 == null && (object)p2 == null) + if(p1 is null && p2 is null) return 0; - if((object)p1 != null && (object)p2 == null) + if(!(p1 is null) && p2 is null) return 1; - if((object)p1 == null && (object)p2 != null) + if(p1 is null && !(p2 is null)) return -1; if(p1.StartDateTime > p2.StartDateTime) diff --git a/Source/EWSPDI/Properties/AssemblyInfoShared.cs b/Source/EWSPDI/Properties/AssemblyInfoShared.cs index b4bfe2a..d43560f 100644 --- a/Source/EWSPDI/Properties/AssemblyInfoShared.cs +++ b/Source/EWSPDI/Properties/AssemblyInfoShared.cs @@ -2,7 +2,7 @@ // System : Personal Data Interchange Classes // File : AssemblyInfo.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/17/2018 +// Updated : 12/01/2018 // Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -51,16 +51,16 @@ // This is used to set the assembly version in the strong name. This should remain unchanged to maintain binary // compatibility with prior releases. It should only be changed if a breaking change is made that requires // assemblies that reference older versions to be recompiled against the newer version. -[assembly: AssemblyVersion("2018.11.17.0")] +[assembly: AssemblyVersion("2018.12.1.0")] // Common assembly file version // // This is used to set the assembly file version. This will change with each new release. MSIs only support a // Major value between 0 and 255 so we drop the century from the year on this one. -[assembly: AssemblyFileVersion("18.11.17.0")] +[assembly: AssemblyFileVersion("18.12.1.0")] // Common product version // // This may contain additional text to indicate Alpha or Beta states. The version number will always match the // file version above but includes the century on the year. -[assembly: AssemblyInformationalVersion("2018.11.17.0")] +[assembly: AssemblyInformationalVersion("2018.12.1.0")] diff --git a/Source/EWSPDI/RecurDateTime.cs b/Source/EWSPDI/RecurDateTime.cs index 467d176..4c0e645 100644 --- a/Source/EWSPDI/RecurDateTime.cs +++ b/Source/EWSPDI/RecurDateTime.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RecurDateTime.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class that contains a date/time object used in the calculation of recurring date/times. @@ -74,11 +74,11 @@ public enum DateTimePart /// year value supported by a normal object. public int Year { - get { return year; } + get => year; set { if(value < DateTime.MinValue.Year) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRDTYearOutOfRange")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRDTYearOutOfRange")); year = value; } @@ -93,11 +93,11 @@ public int Year /// than 11. public int Month { - get { return month; } + get => month; set { if(value < 0 || value > 11) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRDTBadMonth")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRDTBadMonth")); month = value; } @@ -111,11 +111,11 @@ public int Month /// than 31. public int Day { - get { return day; } + get => day; set { if(value < 1 || value > 31) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRDTBadDay")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRDTBadDay")); day = value; } @@ -128,11 +128,11 @@ public int Day /// than 23. public int Hour { - get { return hour; } + get => hour; set { if(value < 0 || value > 23) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRDTBadHour")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRDTBadHour")); hour = value; } @@ -145,11 +145,11 @@ public int Hour /// than 59. public int Minute { - get { return minute; } + get => minute; set { if(value < 0 || value > 59) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRDTBadMinute")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRDTBadMinute")); minute = value; } @@ -162,11 +162,11 @@ public int Minute /// than 59. public int Second { - get { return second; } + get => second; set { if(value < 0 || value > 59) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRDTBadSecond")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRDTBadSecond")); second = value; } @@ -178,10 +178,7 @@ public int Second /// You should check to be sure the date is valid before using this property. If not valid, /// either adjust the date or discard it. /// This is thrown if the date is not valid - public DayOfWeek DayOfWeek - { - get { return this.ToDateTime().DayOfWeek; } - } + public DayOfWeek DayOfWeek => this.ToDateTime().DayOfWeek; /// /// This read-only property is used to get the day of the year of the date @@ -189,10 +186,8 @@ public DayOfWeek DayOfWeek /// You should check to be sure the date is valid before using this property. If not valid, /// either adjust the date or discard it. /// This is thrown if the date is not valid - public int DayOfYear - { - get { return this.ToDateTime().DayOfYear; } - } + public int DayOfYear => this.ToDateTime().DayOfYear; + #endregion #region Constructors @@ -239,10 +234,10 @@ public RecurDateTime(RecurDateTime rdt) /// Returns true if the date/times are equal, false if they are not public static bool Equals(RecurDateTime r1, RecurDateTime r2) { - if((object)r1 == null && (object)r2 == null) + if(r1 is null && r2 is null) return true; - if((object)r1 == null) + if(r1 is null) return false; return r1.Equals(r2); @@ -543,14 +538,13 @@ public int CompareTo(object obj) /// There are two versions of this method public static int Compare(RecurDateTime r1, RecurDateTime r2) { - // Cast as object for null checks or it goes recursive - if((object)r1 == null && (object)r2 == null) + if(r1 is null && r2 is null) return 0; - if((object)r1 != null && (object)r2 == null) + if(!(r1 is null) && r2 is null) return 1; - if((object)r1 == null && (object)r2 != null) + if(r1 is null && !(r2 is null)) return -1; if(r1.Year < r2.Year) @@ -603,14 +597,13 @@ public static int Compare(RecurDateTime r1, RecurDateTime r2) /// first instance is greater than the second. public static int Compare(RecurDateTime r1, RecurDateTime r2, DateTimePart part) { - // Cast as object for null checks or it goes recursive - if((object)r1 == null && (object)r2 == null) + if(r1 is null && r2 is null) return 0; - if((object)r1 != null && (object)r2 == null) + if(!(r1 is null) && r2 is null) return 1; - if((object)r1 == null && (object)r2 != null) + if(r1 is null && !(r2 is null)) return -1; if(r1.Year < r2.Year) diff --git a/Source/EWSPDI/RecurOptsDataSource.cs b/Source/EWSPDI/RecurOptsDataSource.cs index e93a758..16293db 100644 --- a/Source/EWSPDI/RecurOptsDataSource.cs +++ b/Source/EWSPDI/RecurOptsDataSource.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RecurOptsDataSource.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/24/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a helper class that can be used to obtain a list of values suitable for binding to a combo @@ -39,19 +39,13 @@ public static class RecurOptsDataSource /// /// An interface reference suitable for data binding. The underlying object /// is a containing a set of objects. - public static IList DayOccurrences - { - get - { - return new List(new[] { - new ListItem(DayOccurrence.First, LR.EnumDesc(DayOccurrence.First)), - new ListItem(DayOccurrence.Second, LR.EnumDesc(DayOccurrence.Second)), - new ListItem(DayOccurrence.Third, LR.EnumDesc(DayOccurrence.Third)), - new ListItem(DayOccurrence.Fourth, LR.EnumDesc(DayOccurrence.Fourth)), - new ListItem(DayOccurrence.Last, LR.EnumDesc(DayOccurrence.Last)) - }); - } - } + public static IList DayOccurrences => new List(new[] { + new ListItem(DayOccurrence.First, LR.EnumDesc(DayOccurrence.First)), + new ListItem(DayOccurrence.Second, LR.EnumDesc(DayOccurrence.Second)), + new ListItem(DayOccurrence.Third, LR.EnumDesc(DayOccurrence.Third)), + new ListItem(DayOccurrence.Fourth, LR.EnumDesc(DayOccurrence.Fourth)), + new ListItem(DayOccurrence.Last, LR.EnumDesc(DayOccurrence.Last)) + }); /// /// This read-only property returns a data source containing the days of the week based on diff --git a/Source/EWSPDI/Recurrence.cs b/Source/EWSPDI/Recurrence.cs index 94b14c7..05de860 100644 --- a/Source/EWSPDI/Recurrence.cs +++ b/Source/EWSPDI/Recurrence.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : Recurrence.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/31/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class that can be used to generate recurring date/time sequences based on a pattern @@ -58,7 +58,7 @@ public class Recurrence : ISerializable, IXmlSerializable // This is used to convert the days of the week to their string form. This is convenient for generating // its iCalendar representation. - private static string[] abbrevDays = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; + private static readonly string[] abbrevDays = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; private DateTime startDate; @@ -97,6 +97,7 @@ public class Recurrence : ISerializable, IXmlSerializable // These are used to contain holidays for the CanOccurOnHoliday option when it is set to false. Note // that the holiday collection is static and will be shared by all Recurrence instances. private static HolidayCollection holidays; + // These are used to contain holidays for the CanOccurOnHoliday option when it is set to false on // a per-recurrence instance basis. private HolidayCollection instanceHolidays; @@ -120,14 +121,14 @@ public class Recurrence : ISerializable, IXmlSerializable /// will be defaulted to the corresponding values found in the start date/time. public DateTime StartDateTime { - get { return startDate; } + get => startDate; set { startDate = value; // Get the offset used for the WEEKLY frequency and the BYWEEKNO rule. This is used to shift the // day to the start date's day of the week. - weekdayOffset = ((int)startDate.DayOfWeek + 7 - (int)weekStart) % 7; + weekdayOffset = ((int)startDate.DayOfWeek + 7 - (int)weekStart) % 7; } } @@ -184,11 +185,11 @@ public DateTime RecurUntil /// This is thrown if the value is negative public int MaximumOccurrences { - get { return maxOccur; } + get => maxOccur; set { if(value < 0) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRecurNegativeCount")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRecurNegativeCount")); maxOccur = value; untilDate = DateTime.MaxValue; @@ -205,7 +206,7 @@ public int MaximumOccurrences /// public bool CanOccurOnHoliday { - get { return canOccurOnHoliday; } + get => canOccurOnHoliday; set { canOccurOnHoliday = value; @@ -220,7 +221,7 @@ public bool CanOccurOnHoliday /// public RecurFrequency Frequency { - get { return frequency; } + get => frequency; set { frequency = value; @@ -270,11 +271,11 @@ public RecurFrequency Frequency /// This is thrown if the value is less than one public int Interval { - get { return interval; } + get => interval; set { if(value < 1) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRecurBadInterval")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRecurBadInterval")); interval = value; } @@ -288,14 +289,14 @@ public int Interval /// property. The default value is Monday. public DayOfWeek WeekStart { - get { return weekStart; } + get => weekStart; set { weekStart = value; // Get the offset used for the WEEKLY frequency and the BYWEEKNO rule. This is used to shift the // day to the start date's day of the week. - weekdayOffset = ((int)startDate.DayOfWeek + 7 - (int)weekStart) % 7; + weekdayOffset = ((int)startDate.DayOfWeek + 7 - (int)weekStart) % 7; } } @@ -305,10 +306,7 @@ public DayOfWeek WeekStart /// The collection contains a set of unique integer values representing month values from 1 to /// 12. /// - public UniqueIntegerCollection ByMonth - { - get { return byMonth; } - } + public UniqueIntegerCollection ByMonth => byMonth; /// /// This is used to modify the BYWEEKNO rule of a recurrence @@ -318,10 +316,7 @@ public UniqueIntegerCollection ByMonth /// values specify a week number from the start of the year. This rule is only applicable to the /// Yearly frequency. It is ignored for all other frequencies. /// - public UniqueIntegerCollection ByWeekNo - { - get { return byWeekNo; } - } + public UniqueIntegerCollection ByWeekNo => byWeekNo; /// /// This is used to modify the BYYEARDAY rule of a recurrence @@ -330,10 +325,7 @@ public UniqueIntegerCollection ByWeekNo /// -366 to +366 excluding zero. Negative values specify a day number from the end of the year. /// Positive values specify a day number from the start of the year. /// - public UniqueIntegerCollection ByYearDay - { - get { return byYearDay; } - } + public UniqueIntegerCollection ByYearDay => byYearDay; /// /// This is used to modify the BYMONTHDAY rule of a recurrence @@ -342,10 +334,7 @@ public UniqueIntegerCollection ByYearDay /// -31 to +31 excluding zero. Negative values specify a day number from the end of the month. Positive /// values specify a day number from the start of the month. /// - public UniqueIntegerCollection ByMonthDay - { - get { return byMonthDay; } - } + public UniqueIntegerCollection ByMonthDay => byMonthDay; /// /// This is used to modify the BYHOUR rule of a recurrence @@ -353,10 +342,7 @@ public UniqueIntegerCollection ByMonthDay /// The collection contains a set of unique integer values representing hour values from 0 to /// 23. /// - public UniqueIntegerCollection ByHour - { - get { return byHour; } - } + public UniqueIntegerCollection ByHour => byHour; /// /// This is used to modify the BYMINUTE rule of a recurrence @@ -364,10 +350,7 @@ public UniqueIntegerCollection ByHour /// The collection contains a set of unique integer values representing minutes values from 0 to /// 59. /// - public UniqueIntegerCollection ByMinute - { - get { return byMinute; } - } + public UniqueIntegerCollection ByMinute => byMinute; /// /// This is used to modify the BYSECOND rule of a recurrence @@ -375,10 +358,7 @@ public UniqueIntegerCollection ByMinute /// The collection contains a set of unique integer values representing seconds values from 0 to /// 59. /// - public UniqueIntegerCollection BySecond - { - get { return bySecond; } - } + public UniqueIntegerCollection BySecond => bySecond; /// /// This is used to modify the BYSETPOS rule of a recurrence @@ -388,10 +368,7 @@ public UniqueIntegerCollection BySecond /// be from -366 to +366 excluding zero. Negative values specify an index from the end of the set. /// Positive values specify an index from the start of the set. Zero is not a valid index value. /// - public UniqueIntegerCollection BySetPos - { - get { return bySetPos; } - } + public UniqueIntegerCollection BySetPos => bySetPos; /// /// This is used to modify the BYDAY rule of a recurrence @@ -399,10 +376,7 @@ public UniqueIntegerCollection BySetPos /// The collection contains a set of unique values representing day of /// the week instances on which calculated recurrence dates can fall. /// - public DayInstanceCollection ByDay - { - get { return byDay; } - } + public DayInstanceCollection ByDay => byDay; /// /// This is used to add holidays to the recurrence holiday list. These will be used in conjunction with @@ -432,23 +406,16 @@ public static HolidayCollection Holidays /// public HolidayCollection InstanceHolidays { - get - { - return instanceHolidays; - } - set { - instanceHolidays = value; - } + get => instanceHolidays; + set => instanceHolidays = value; } /// /// This returns a set of custom properties (if any) found when the recurrence properties where parsed /// from a string. /// - public StringCollection CustomProperties - { - get { return customProps; } - } + public StringCollection CustomProperties => customProps; + #endregion #region Constructors @@ -578,7 +545,7 @@ private void ParseVCalendar(string recurrenceText) break; if(dayIdx == 7) - throw new ArgumentException(LR.GetString("ExRecurBadDOW"), "recurrenceText"); + throw new ArgumentException(LR.GetString("ExRecurBadDOW"), nameof(recurrenceText)); byDay.Add(new DayInstance((DayOfWeek)dayIdx)); } @@ -642,7 +609,7 @@ private void ParseVCalendar(string recurrenceText) break; if(dayIdx == 7) - throw new ArgumentException(LR.GetString("ExRecurBadDOW"), "recurrenceText"); + throw new ArgumentException(LR.GetString("ExRecurBadDOW"), nameof(recurrenceText)); byDay.Add(new DayInstance(instance, (DayOfWeek)dayIdx)); } @@ -697,7 +664,7 @@ private void ParseVCalendar(string recurrenceText) break; default: - throw new ArgumentException(LR.GetString("ExRecurUnknownRuleFormat"), "recurrenceText"); + throw new ArgumentException(LR.GetString("ExRecurUnknownRuleFormat"), nameof(recurrenceText)); } } @@ -1239,9 +1206,7 @@ public void Parse(string recur) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - Recurrence r = obj as Recurrence; - - if(r == null) + if(!(obj is Recurrence r)) return false; return (this == r || this.ToString() == r.ToString()); @@ -1613,7 +1578,7 @@ public void RecurMonthly(int day, int recurInterval) { // Day of the month should be between 1 and 31 if(day < 1 || day > 31) - throw new ArgumentOutOfRangeException("day", day, LR.GetString("ExRecurBadDayOfMonth")); + throw new ArgumentOutOfRangeException(nameof(day), day, LR.GetString("ExRecurBadDayOfMonth")); this.Frequency = RecurFrequency.Monthly; this.Interval = recurInterval; @@ -1719,12 +1684,12 @@ public void RecurYearly(int month, int day, int recurInterval) { // Month should be valid if(month < 1 || month > 12) - throw new ArgumentOutOfRangeException("month", month, LR.GetString("ExRecurBadMonth")); + throw new ArgumentOutOfRangeException(nameof(month), month, LR.GetString("ExRecurBadMonth")); // Day of the month should be valid. NOTE: We use a leap year so that 29 is valid for February. // It'll get thrown out by the recurrence when it isn't valid. if(day < 1 || day > DateTime.DaysInMonth(2004, month)) - throw new ArgumentOutOfRangeException("day", day, LR.GetString("ExRecurInvalidDayForMonth")); + throw new ArgumentOutOfRangeException(nameof(day), day, LR.GetString("ExRecurInvalidDayForMonth")); this.Frequency = RecurFrequency.Yearly; this.Interval = recurInterval; @@ -1763,7 +1728,7 @@ public void RecurYearly(DayOccurrence occur, DaysOfWeek daysOfWeek, int month, i { // Month should be valid if(month < 1 || month > 12) - throw new ArgumentOutOfRangeException("month", month, LR.GetString("ExRecurBadMonth")); + throw new ArgumentOutOfRangeException(nameof(month), month, LR.GetString("ExRecurBadMonth")); this.Frequency = RecurFrequency.Yearly; this.Interval = recurInterval; diff --git a/Source/EWSPDI/RecurrenceEnumerator.cs b/Source/EWSPDI/RecurrenceEnumerator.cs index ff0d626..1abc480 100644 --- a/Source/EWSPDI/RecurrenceEnumerator.cs +++ b/Source/EWSPDI/RecurrenceEnumerator.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RecurrenceEnumerator.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/24/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a type-safe enumerator for Recurrence objects @@ -59,18 +59,12 @@ public RecurrenceEnumerator(Recurrence recurrence) /// /// Type-safe enumerator Current method /// - public DateTime Current - { - get { return dates[idx]; } - } + public DateTime Current => dates[idx]; /// /// Type-unsafe IEnumerator.Current /// - object System.Collections.IEnumerator.Current - { - get { return dates[idx]; } - } + object System.Collections.IEnumerator.Current => dates[idx]; /// /// Move to the next element diff --git a/Source/EWSPDI/StringCollection.cs b/Source/EWSPDI/StringCollection.cs index b6baf34..3cec462 100644 --- a/Source/EWSPDI/StringCollection.cs +++ b/Source/EWSPDI/StringCollection.cs @@ -2,7 +2,7 @@ // System : Personal Data Interchange Classes // File : StringCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/16/2018 +// Updated : 11/23/2018 // Note : Copyright 2014-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -35,6 +35,7 @@ public class StringCollection : Collection //===================================================================== private bool suppressListChanged; + #endregion #region Events @@ -52,10 +53,7 @@ public class StringCollection : Collection /// The event arguments protected virtual void OnListChanged(ListChangedEventArgs e) { - var handler = ListChanged; - - if(handler != null) - handler(this, e); + ListChanged?.Invoke(this, e); } #endregion diff --git a/Source/EWSPDI/UniqueIntegerCollection.cs b/Source/EWSPDI/UniqueIntegerCollection.cs index 9e3c82b..ff86e6e 100644 --- a/Source/EWSPDI/UniqueIntegerCollection.cs +++ b/Source/EWSPDI/UniqueIntegerCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : UniqueIntegerCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/24/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a type-safe collection class that is used to contain a set of unique integer values with @@ -20,6 +20,8 @@ // 03/05/2007 EFW Converted to use a generic base class //=============================================================================================================== +// Ignore Spelling: ic + using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -33,7 +35,7 @@ namespace EWSoftware.PDI /// A type-safe collection of unique integer values with an optional range restriction and zero exclusion /// [Serializable] - public class UniqueIntegerCollection : Collection + public class UniqueIntegerCollection : Collection { #region Private data members //===================================================================== @@ -42,8 +44,6 @@ public class UniqueIntegerCollection : Collection private static Regex reStripNonDigits = new Regex(@"[^0-9\-,]"); private static Regex reIsRange = new Regex("(?<=[^-])-"); - private int minValue, maxValue; // Validation range - private bool allowZero; // Allow zero as a valid value #endregion #region Properties @@ -52,28 +52,20 @@ public class UniqueIntegerCollection : Collection /// /// This read-only property is used to get the minimum value allowed to be added to the collection /// - public int MinimumValue - { - get { return minValue; } - } + public int MinimumValue { get; } /// /// This read-only property is used to get the highest value allowed to be added to the collection /// - public int MaximumValue - { - get { return maxValue; } - } + public int MaximumValue { get; } /// /// This read-only property is used to get whether or not zero is allowed as a valid value /// /// This is useful if you need to set a valid range that includes negative and positive values but /// excludes zero (i.e. -53 to -1 and +1 to +53 but not zero). - public bool AllowZero - { - get { return allowZero; } - } + public bool AllowZero { get; } + #endregion #region Constructors @@ -86,9 +78,9 @@ public bool AllowZero /// There are five overloads for the constructor public UniqueIntegerCollection() { - minValue = Int32.MinValue; - maxValue = Int32.MaxValue; - allowZero = true; + this.MinimumValue = Int32.MinValue; + this.MaximumValue = Int32.MaxValue; + this.AllowZero = true; } /// @@ -99,9 +91,9 @@ public UniqueIntegerCollection() /// Allow zero or not public UniqueIntegerCollection(int min, int max, bool zeroAllowed) { - minValue = min; - maxValue = max; - allowZero = zeroAllowed; + this.MinimumValue = min; + this.MaximumValue = max; + this.AllowZero = zeroAllowed; } /// @@ -139,9 +131,9 @@ public UniqueIntegerCollection(UniqueIntegerCollection values) { if(values != null) { - minValue = values.MinimumValue; - maxValue = values.MaximumValue; - allowZero = values.AllowZero; + this.MinimumValue = values.MinimumValue; + this.MaximumValue = values.MaximumValue; + this.AllowZero = values.AllowZero; this.AddRange(values); } @@ -174,11 +166,11 @@ public void AddRange(IEnumerable values) /// the collection. protected override void InsertItem(int index, int item) { - if(item < minValue || item > maxValue) - throw new ArgumentOutOfRangeException("item", item, LR.GetString("ExUICValueOutOfRange")); + if(item < this.MinimumValue || item > this.MaximumValue) + throw new ArgumentOutOfRangeException(nameof(item), item, LR.GetString("ExUICValueOutOfRange")); - if(item == 0 && !allowZero) - throw new ArgumentException(LR.GetString("ExUICZerosNotAllowed"), "item"); + if(item == 0 && !this.AllowZero) + throw new ArgumentException(LR.GetString("ExUICZerosNotAllowed"), nameof(item)); int curIdx = base.IndexOf(item); @@ -303,7 +295,7 @@ public override string ToString() public void ParseValues(string values) { string[] parts, range; - int value, high, low; + int value; // Remove all characters that are not a digit, dash, or comma string parse = reStripNonDigits.Replace(values, String.Empty); @@ -315,7 +307,7 @@ public void ParseValues(string values) { // Single value. Discard invalid and out of range entries. if(Int32.TryParse(s, NumberStyles.Integer, CultureInfo.InvariantCulture, out value) && - value >= minValue && value <= maxValue && (value != 0 || allowZero)) + value >= this.MinimumValue && value <= this.MaximumValue && (value != 0 || this.AllowZero)) base.Add(value); } else @@ -324,8 +316,8 @@ public void ParseValues(string values) range = reIsRange.Split(s); // Discard invalid entries - if(Int32.TryParse(range[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out low) && - Int32.TryParse(range[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out high)) + if(Int32.TryParse(range[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out int low) && + Int32.TryParse(range[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out int high)) { // Flip the range if necessary if(low > high) @@ -338,7 +330,7 @@ public void ParseValues(string values) // Out of range values are discarded while(low <= high) { - if(low >= minValue && low <= maxValue && (low != 0 || allowZero)) + if(low >= this.MinimumValue && low <= this.MaximumValue && (low != 0 || this.AllowZero)) base.Add(low); low++; diff --git a/Source/EWSPDI/YearlyFrequency.cs b/Source/EWSPDI/YearlyFrequency.cs index 986a3af..9987307 100644 --- a/Source/EWSPDI/YearlyFrequency.cs +++ b/Source/EWSPDI/YearlyFrequency.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : YearlyFrequency.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/22/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to implements the Yearly frequency rules @@ -101,8 +101,7 @@ public int ByMonth(Recurrence r, RecurDateTimeCollection dates) // Expand the date/time by adding a new entry for each month specified for(expIdx = 0; expIdx < byMonth.Count; expIdx++) { - rdtNew = new RecurDateTime(rdt); - rdtNew.Month = byMonth[expIdx] - 1; + rdtNew = new RecurDateTime(rdt) { Month = byMonth[expIdx] - 1 }; dates.Add(rdtNew); } } @@ -190,9 +189,7 @@ public int ByYearDay(Recurrence r, RecurDateTimeCollection dates) for(expIdx = 0; expIdx < byYearDay.Count; expIdx++) { yearDay = byYearDay[expIdx]; - rdtNew = new RecurDateTime(rdt); - rdtNew.Month = 0; - rdtNew.Day = 1; + rdtNew = new RecurDateTime(rdt) { Month = 0, Day = 1 }; // From start of year or end of year? if(yearDay > 0) @@ -259,9 +256,7 @@ public int ByDay(Recurrence r, RecurDateTimeCollection dates) if(instance == 0) { // Expand to every specified day of the week in the year - rdtNew = new RecurDateTime(rdt); - rdtNew.Month = 0; - rdtNew.Day = 1; + rdtNew = new RecurDateTime(rdt) { Month = 0, Day = 1 }; rdtNew.AddDays(((int)dow + 7 - (int)rdtNew.DayOfWeek) % 7); while(rdtNew.Year == rdt.Year) @@ -276,17 +271,13 @@ public int ByDay(Recurrence r, RecurDateTimeCollection dates) if(instance > 0) { // Add the nth instance of the day of the week - rdtNew = new RecurDateTime(rdt); - rdtNew.Month = 0; - rdtNew.Day = 1; + rdtNew = new RecurDateTime(rdt) { Month = 0, Day = 1 }; rdtNew.AddDays((((int)dow + 7 - (int)rdtNew.DayOfWeek) % 7) + ((instance - 1) * 7)); } else { // Add the nth instance of the day of the week from the end of the year - rdtNew = new RecurDateTime(rdt); - rdtNew.Month = 11; - rdtNew.Day = 31; + rdtNew = new RecurDateTime(rdt) { Month = 11, Day = 31 }; rdtNew.AddDays(0 - (((int)rdtNew.DayOfWeek + 7 - (int)dow) % 7) + ((instance + 1) * 7)); } diff --git a/Source/EWSPDIData/Binding/ChildPropertyDescriptor.cs b/Source/EWSPDIData/Binding/ChildPropertyDescriptor.cs index 424e066..43616ab 100644 --- a/Source/EWSPDIData/Binding/ChildPropertyDescriptor.cs +++ b/Source/EWSPDIData/Binding/ChildPropertyDescriptor.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ChildPropertyDescriptor.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/05/2014 -// Note : Copyright 2007-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2007-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a property descriptor that is used to return information for a child property @@ -42,29 +42,21 @@ public class ChildPropertyDescriptor : PropertyDescriptor /// This is used to indicate whether or not the property is read-only /// /// True if the property is read-only or false if it is not - public override bool IsReadOnly - { - get { return childPD.IsReadOnly; } - } + public override bool IsReadOnly => childPD.IsReadOnly; /// /// This returns the type for the component to which the property is bound /// /// Returns a that represents the type of component to which the property is /// bound. - public override Type ComponentType - { - get { return parentPD.ComponentType; } - } + public override Type ComponentType => parentPD.ComponentType; /// /// This returns the type for the property /// /// Returns a that represents the type of the property - public override Type PropertyType - { - get { return childPD.PropertyType; } - } + public override Type PropertyType => childPD.PropertyType; + #endregion #region Constructor diff --git a/Source/EWSPDIData/Binding/ExtendedBindingList.cs b/Source/EWSPDIData/Binding/ExtendedBindingList.cs index 6ca2c03..a7a9dcd 100644 --- a/Source/EWSPDIData/Binding/ExtendedBindingList.cs +++ b/Source/EWSPDIData/Binding/ExtendedBindingList.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ExtendedBindingList.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2007-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2007-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a generic, bindable base class used to hold a collection of items and supports various @@ -71,10 +71,7 @@ public ExtendedBindingList(IList items) : base(items) /// /// This returns an object that can be used to synchronize access to the collection /// - public object SyncRoot - { - get { return ((ICollection)this).SyncRoot; } - } + public object SyncRoot => ((ICollection)this).SyncRoot; /// /// Add a range of items from an array @@ -331,35 +328,23 @@ public bool TrueForAll(Predicate match) /// This is used to indicate whether or not sorting is supported /// /// This always returns true. - protected override bool SupportsSortingCore - { - get { return true; } - } + protected override bool SupportsSortingCore => true; /// /// This returns a flag indicating whether or not sorting is currently applied /// /// Returns true if sorting is applied or false if not - protected override bool IsSortedCore - { - get { return isSorted; } - } + protected override bool IsSortedCore => isSorted; /// /// This returns the current sort direction if sorting has been applied /// - protected override ListSortDirection SortDirectionCore - { - get { return sortDirection; } - } + protected override ListSortDirection SortDirectionCore => sortDirection; /// /// This returns the current property descriptor if sorting has been applied /// - protected override PropertyDescriptor SortPropertyCore - { - get { return sortProperty; } - } + protected override PropertyDescriptor SortPropertyCore => sortProperty; /// /// This is overridden to apply a sort based on the selected property descriptor and sort direction @@ -396,10 +381,7 @@ protected override void RemoveSortCore() /// This is used to indicate whether or not searching is supported /// /// This always returns true - protected override bool SupportsSearchingCore - { - get { return true; } - } + protected override bool SupportsSearchingCore => true; /// /// This searches for the index of the item that has the specified property descriptor with the specified diff --git a/Source/EWSPDIData/Binding/PropertyComparer.cs b/Source/EWSPDIData/Binding/PropertyComparer.cs index 3b6c69e..2fd8201 100644 --- a/Source/EWSPDIData/Binding/PropertyComparer.cs +++ b/Source/EWSPDIData/Binding/PropertyComparer.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PropertyComparer.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2007-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2007-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a generic comparer class that compares two items based on values retrieved from a property @@ -37,7 +37,7 @@ public class PropertyComparer : IComparer //===================================================================== private PropertyDescriptor property; - private ListSortDirection direction; + private readonly ListSortDirection direction; #endregion @@ -88,9 +88,7 @@ public int Compare(T x, T y) // Try comparing using IComparable. If that won't work, see if they are equal. If not, compare them // as strings. - IComparable comp = value1 as IComparable; - - if(comp != null) + if(value1 is IComparable comp) result = comp.CompareTo(value2); else if(value1.Equals(value2)) diff --git a/Source/EWSPDIData/DateTimeInstance.cs b/Source/EWSPDIData/DateTimeInstance.cs index 83a96ff..4ce5f45 100644 --- a/Source/EWSPDIData/DateTimeInstance.cs +++ b/Source/EWSPDIData/DateTimeInstance.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : DateTimeInstance.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the date/time instance class used by the time zone conversion methods @@ -62,7 +62,7 @@ public class DateTimeInstance /// . If this is null, the times are assumed to be in local time. public string TimeZoneId { - get { return timeZoneID; } + get => timeZoneID; set { if(value == null || value.Length == 0) @@ -77,8 +77,8 @@ public string TimeZoneId /// public DateTime StartDateTime { - get { return startDate; } - set { startDate = value; } + get => startDate; + set => startDate = value; } /// @@ -86,8 +86,8 @@ public DateTime StartDateTime /// public DateTime EndDateTime { - get { return endDate; } - set { endDate = value; } + get => endDate; + set => endDate = value; } /// @@ -95,8 +95,8 @@ public DateTime EndDateTime /// public Duration Duration { - get { return duration; } - set { duration = value; } + get => duration; + set => duration = value; } /// @@ -104,8 +104,8 @@ public Duration Duration /// public bool StartIsDaylightSavingTime { - get { return startIsDST; } - set { startIsDST = value; } + get => startIsDST; + set => startIsDST = value; } /// @@ -113,8 +113,8 @@ public bool StartIsDaylightSavingTime /// public bool EndIsDaylightSavingTime { - get { return endIsDST; } - set { endIsDST = value; } + get => endIsDST; + set => endIsDST = value; } /// @@ -123,7 +123,7 @@ public bool EndIsDaylightSavingTime /// public string StartTimeZoneName { - get { return startTZName; } + get => startTZName; set { if(value == null) @@ -139,7 +139,7 @@ public string StartTimeZoneName /// public string EndTimeZoneName { - get { return endTZName; } + get => endTZName; set { if(value == null) @@ -270,9 +270,7 @@ public DateTimeInstance(DateTimeInstance dti) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - DateTimeInstance dti = obj as DateTimeInstance; - - if(dti == null) + if(!(obj is DateTimeInstance dti)) return false; return (startDate == dti.StartDateTime && endDate == dti.EndDateTime && duration == dti.Duration && diff --git a/Source/EWSPDIData/EWSoftware.PDI.Data.csproj b/Source/EWSPDIData/EWSoftware.PDI.Data.csproj index 6bc5372..eeb0626 100644 --- a/Source/EWSPDIData/EWSoftware.PDI.Data.csproj +++ b/Source/EWSPDIData/EWSoftware.PDI.Data.csproj @@ -9,8 +9,8 @@ EWSoftware PDI Data Library Copyright (c) 2003-2018, Eric Woodruff, All Rights Reserved en - 2018.11.17.0 - 18.11.17.0 + 2018.12.1.0 + 18.12.1.0 This library contains classes used to create and consume vCard, vCalendar, and iCalendar files used to exchange contact and appointment information between applications such as Microsoft Outlook. See the project website for the code, a help file, and demos. Eric Woodruff https://raw.githubusercontent.com/EWSoftware/PDI/master/EWSPDI.png diff --git a/Source/EWSPDIData/LocalizedResources.cs b/Source/EWSPDIData/LocalizedResources.cs index 8355ad3..7d1ca5f 100644 --- a/Source/EWSPDIData/LocalizedResources.cs +++ b/Source/EWSPDIData/LocalizedResources.cs @@ -1,9 +1,9 @@ //=============================================================================================================== -// System : Miscellaneous Date Utility Classes +// System : Personal Data Interchange Classes // File : LocalizedResources.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains some internal classes used to manage the localized resources for the assembly @@ -41,7 +41,7 @@ internal static class LR private static ResourceManager rm; // This is a helper object used to quickly lock the class when creating the resource manager - private static object syncRoot = new Object(); + private static readonly object syncRoot = new Object(); #endregion @@ -63,10 +63,7 @@ private static ResourceManager Resources { Assembly asm = Assembly.GetExecutingAssembly(); - string baseName = String.Format(CultureInfo.CurrentCulture, "{0}.{1}", - asm.GetName().Name, ResourcesKey); - - rm = new ResourceManager(baseName, asm); + rm = new ResourceManager($"{asm.GetName().Name}.{ResourcesKey}", asm); } } } @@ -90,7 +87,7 @@ internal static string GetString(string name) string s = Resources.GetString(name, null); if(s == null) - s = String.Format(CultureInfo.CurrentCulture, "[?:{0}]", name); + s = $"[?:{name}]"; return s; } diff --git a/Source/EWSPDIData/PDIObject.cs b/Source/EWSPDIData/PDIObject.cs index e416ec2..5b0e144 100644 --- a/Source/EWSPDIData/PDIObject.cs +++ b/Source/EWSPDIData/PDIObject.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PDIObject.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the base class for all of the Personal Data Interchange (PDI) classes @@ -61,7 +61,7 @@ public abstract class PDIObject : ICloneable /// object. public virtual SpecificationVersions Version { - get { return version; } + get => version; set { if(value == SpecificationVersions.None) diff --git a/Source/EWSPDIData/PDIObjects/CalendarObject.cs b/Source/EWSPDIData/PDIObjects/CalendarObject.cs index 9969720..c421ba0 100644 --- a/Source/EWSPDIData/PDIObjects/CalendarObject.cs +++ b/Source/EWSPDIData/PDIObjects/CalendarObject.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : CalendarObject.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the base class for all calendar related Personal Data Interchange (PDI) classes and the @@ -42,7 +42,7 @@ public abstract class CalendarObject : PDIObject /// public override SpecificationVersions Version { - get { return base.Version; } + get => base.Version; set { base.Version = value; diff --git a/Source/EWSPDIData/PDIObjects/ObservanceRule.cs b/Source/EWSPDIData/PDIObjects/ObservanceRule.cs index 8d1a728..1a6643e 100644 --- a/Source/EWSPDIData/PDIObjects/ObservanceRule.cs +++ b/Source/EWSPDIData/PDIObjects/ObservanceRule.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ObservanceRule.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/05/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the Observance Rule object used by iCalendar STANDARD and DAYLIGHT @@ -64,18 +64,15 @@ public class ObservanceRule : CalendarObject /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This is used to set or get the rule type /// public ObservanceRuleType RuleType { - get { return ruleType; } - set { ruleType = value; } + get => ruleType; + set => ruleType = value; } /// @@ -412,9 +409,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - ObservanceRule obr = obj as ObservanceRule; - - if(obr == null) + if(!(obj is ObservanceRule obr)) return false; // The ToString() method returns a text representation of the observance based on all of its settings diff --git a/Source/EWSPDIData/PDIObjects/RecurringObject.cs b/Source/EWSPDIData/PDIObjects/RecurringObject.cs index e7ad5e9..adca469 100644 --- a/Source/EWSPDIData/PDIObjects/RecurringObject.cs +++ b/Source/EWSPDIData/PDIObjects/RecurringObject.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RecurringObject.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains an abstract base class from which recurring calendar objects are derived. It defines a @@ -43,7 +43,6 @@ public abstract class RecurringObject : CalendarObject private RDatePropertyCollection rDates; private ExDatePropertyCollection exDates; - private bool excludeStart; #endregion #region Properties @@ -62,11 +61,7 @@ public abstract class RecurringObject : CalendarObject /// This property is saved as a custom property when written to a PDI data stream /// (X-EWSOFTWARE-EXCLUDESTART:1). Also be /// aware that it is not compatible with other /// calendaring systems. - public bool ExcludeStartDateTime - { - get { return excludeStart; } - set { excludeStart = value; } - } + public bool ExcludeStartDateTime { get; set; } /// /// This is used to get the Recurrence Rule (RRULE) properties. There may be more than one. @@ -133,14 +128,8 @@ public ExDatePropertyCollection ExceptionDates /// /// It returns true if any recurrence rules, exception rules, recurrence dates, or exception dates /// are defined. It returns false if none of those items have been specified. - public bool IsRecurring - { - get - { - return (this.RecurrenceRules.Count != 0 || this.ExceptionRules.Count != 0 || - this.RecurDates.Count != 0 || this.ExceptionDates.Count != 0); - } - } + public bool IsRecurring => (this.RecurrenceRules.Count != 0 || this.ExceptionRules.Count != 0 || + this.RecurDates.Count != 0 || this.ExceptionDates.Count != 0); /// /// This must be implemented to return the start date/time property that is used to determine when the @@ -332,7 +321,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) foreach(ExDateProperty e in exDates) BaseProperty.WriteToStream(e, sb, tw); - if(excludeStart) + if(this.ExcludeStartDateTime) tw.Write("X-EWSOFTWARE-EXCLUDESTART:1\r\n"); } @@ -501,7 +490,7 @@ public DateTimeInstanceCollection InstancesBetween(DateTime fromDate, DateTime t p = new Period(startDate, dur); if(((p.StartDateTime >= fromDate && p.StartDateTime <= toDate) || (p.EndDateTime >= fromDate && - p.EndDateTime <= toDate)) && (!this.IsRecurring || !excludeStart)) + p.EndDateTime <= toDate)) && (!this.IsRecurring || !this.ExcludeStartDateTime)) { periods.Add(p); } diff --git a/Source/EWSPDIData/PDIObjects/VAlarm.cs b/Source/EWSPDIData/PDIObjects/VAlarm.cs index 0bb93e5..83c0e45 100644 --- a/Source/EWSPDIData/PDIObjects/VAlarm.cs +++ b/Source/EWSPDIData/PDIObjects/VAlarm.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VAlarm.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the VAlarm object used by vCalendar and iCalendar objects @@ -55,6 +55,7 @@ public class VAlarm : CalendarObject // This is a catch-all that holds all unknown or extension properties private CustomPropertyCollection customProps; + #endregion #region Properties @@ -64,10 +65,8 @@ public class VAlarm : CalendarObject /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This is used to get the Action (ACTION) property. This is a required property and will always be @@ -599,9 +598,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VAlarm a = obj as VAlarm; - - if(a == null) + if(!(obj is VAlarm a)) return false; // The ToString() method returns a text representation of the alarm based on all of its settings so diff --git a/Source/EWSPDIData/PDIObjects/VCard.cs b/Source/EWSPDIData/PDIObjects/VCard.cs index 96df099..2d39c18 100644 --- a/Source/EWSPDIData/PDIObjects/VCard.cs +++ b/Source/EWSPDIData/PDIObjects/VCard.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VCard.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the vCard object and a collection of vCard objects @@ -18,6 +18,8 @@ // 03/14/2004 EFW Created the code //=============================================================================================================== +// Ignore Spelling: vc sw + using System; using System.ComponentModel; using System.Globalization; @@ -43,8 +45,6 @@ public class VCard : PDIObject, ISerializable #region Private data members //===================================================================== - private string groupName; // Group name - // Single vCard properties private FormattedNameProperty fn; private NameProperty name; @@ -76,7 +76,6 @@ public class VCard : PDIObject, ISerializable private CustomPropertyCollection customProps; // These properties are valid for the 3.0 specification only - private bool addProfile; private MimeNameProperty mimeName; private MimeSourceProperty mimeSource; @@ -85,6 +84,7 @@ public class VCard : PDIObject, ISerializable private SortStringProperty sortString; private ClassificationProperty classification; private CategoriesProperty categories; + #endregion #region Properties @@ -94,10 +94,8 @@ public class VCard : PDIObject, ISerializable /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This is overridden to propagate the version to all properties in the object that need it when the @@ -105,7 +103,7 @@ public override SpecificationVersions VersionsSupported /// public override SpecificationVersions Version { - get { return base.Version; } + get => base.Version; set { base.Version = value; @@ -118,11 +116,7 @@ public override SpecificationVersions Version /// /// vCards support grouping. If grouped, this property will contain the name of the group with /// which the vCard is associated. - public string Group - { - get { return groupName; } - set { groupName = value; } - } + public string Group { get; set; } /// /// This property is used to set or get a flag indicating whether or not the PROFILE:VCARD property @@ -130,11 +124,7 @@ public string Group /// /// This property is valid only for the 3.0 specification. Since it doesn't serve much purpose, /// it is false by default. - public bool AddProfile - { - get { return addProfile; } - set { addProfile = value; } - } + public bool AddProfile { get; set; } /// /// This is used to get the Formatted Name (FN) property @@ -651,7 +641,7 @@ protected override void Clone(PDIObject p) this.ClearProperties(); - groupName = o.Group; + this.Group = o.Group; fn = (FormattedNameProperty)o.FormattedName.Clone(); name = (NameProperty)o.Name.Clone(); @@ -678,7 +668,8 @@ protected override void Clone(PDIObject p) this.Agents.CloneRange(o.Agents); this.CustomProperties.CloneRange(o.CustomProperties); - addProfile = o.AddProfile; + this.AddProfile = o.AddProfile; + mimeName = (MimeNameProperty)o.MimeName.Clone(); mimeSource = (MimeSourceProperty)o.MimeSource.Clone(); prodId = (ProductIdProperty)o.ProductId.Clone(); @@ -694,7 +685,7 @@ protected override void Clone(PDIObject p) /// public void ClearProperties() { - groupName = null; + this.Group = null; fn = null; name = null; @@ -721,7 +712,8 @@ public void ClearProperties() agents = null; customProps = null; - addProfile = false; + this.AddProfile = false; + mimeName = null; mimeSource = null; prodId = null; @@ -837,9 +829,7 @@ public void PropagateVersion() /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VCard vc = obj as VCard; - - if(vc == null) + if(!(obj is VCard vc)) return false; // The ToString() method returns a text representation of the vCard based on all of its settings so @@ -928,9 +918,9 @@ public void WriteToStream(TextWriter tw, StringBuilder sb) PropagateVersion(); - if(groupName != null) + if(this.Group != null) { - tw.Write(groupName); + tw.Write(this.Group); tw.Write('.'); } @@ -945,7 +935,7 @@ public void WriteToStream(TextWriter tw, StringBuilder sb) // together. It's not necessary, but it makes things easier to find. if(this.Version == SpecificationVersions.vCard30) { - if(addProfile) + if(this.AddProfile) tw.Write("PROFILE:VCARD\r\n"); BaseProperty.WriteToStream(prodId, sb, tw); @@ -1014,9 +1004,9 @@ public void WriteToStream(TextWriter tw, StringBuilder sb) foreach(CustomProperty c in customProps) BaseProperty.WriteToStream(c, sb, tw); - if(groupName != null) + if(this.Group != null) { - tw.Write(groupName); + tw.Write(this.Group); tw.Write('.'); } diff --git a/Source/EWSPDIData/PDIObjects/VCardCollection.cs b/Source/EWSPDIData/PDIObjects/VCardCollection.cs index b18b491..6e32f9d 100644 --- a/Source/EWSPDIData/PDIObjects/VCardCollection.cs +++ b/Source/EWSPDIData/PDIObjects/VCardCollection.cs @@ -19,6 +19,8 @@ // 03/21/2007 EFW Converted to use a generic base class //=============================================================================================================== +// Ignore Spelling: vc sw + using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Source/EWSPDIData/PDIObjects/VEvent.cs b/Source/EWSPDIData/PDIObjects/VEvent.cs index fa6d3fc..d8ad9e3 100644 --- a/Source/EWSPDIData/PDIObjects/VEvent.cs +++ b/Source/EWSPDIData/PDIObjects/VEvent.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VEvent.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the VEvent object used by vCalendar and iCalendar objects @@ -73,6 +73,7 @@ public class VEvent : RecurringObject // This is a catch-all that holds all unknown or extension properties private CustomPropertyCollection customProps; + #endregion #region Properties @@ -82,10 +83,8 @@ public class VEvent : RecurringObject /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This is used to get the Uniform Resource Locator (URL) property @@ -251,10 +250,7 @@ public TimeStampProperty TimeStamp get { if(dateStamp == null) - { - dateStamp = new TimeStampProperty(); - dateStamp.DateTimeValue = DateTime.Now; - } + dateStamp = new TimeStampProperty { DateTimeValue = DateTime.Now }; return dateStamp; } @@ -582,10 +578,8 @@ public override Duration InstanceDuration /// /// It returns the of the /// property. - public override string TimeZoneId - { - get { return this.StartDateTime.TimeZoneId; } - } + public override string TimeZoneId => this.StartDateTime.TimeZoneId; + #endregion #region Constructor @@ -982,9 +976,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VEvent ev = obj as VEvent; - - if(ev == null) + if(!(obj is VEvent ev)) return false; // The ToString() method returns a text representation of the event based on all of its settings so diff --git a/Source/EWSPDIData/PDIObjects/VFreeBusy.cs b/Source/EWSPDIData/PDIObjects/VFreeBusy.cs index 49a5091..b418a14 100644 --- a/Source/EWSPDIData/PDIObjects/VFreeBusy.cs +++ b/Source/EWSPDIData/PDIObjects/VFreeBusy.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VFreeBusy.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the VFreeBusy object used by vCalendar and iCalendar objects @@ -56,6 +56,7 @@ public class VFreeBusy : CalendarObject // This is a catch-all that holds all unknown or extension properties private CustomPropertyCollection customProps; + #endregion #region Properties @@ -65,10 +66,7 @@ public class VFreeBusy : CalendarObject /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This is used to get the Uniform Resource Locator (URL) property @@ -140,10 +138,7 @@ public TimeStampProperty TimeStamp get { if(timeStamp == null) - { - timeStamp = new TimeStampProperty(); - timeStamp.DateTimeValue = DateTime.Now; - } + timeStamp = new TimeStampProperty { DateTimeValue = DateTime.Now }; return timeStamp; } @@ -500,9 +495,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VFreeBusy fb = obj as VFreeBusy; - - if(fb == null) + if(!(obj is VFreeBusy fb)) return false; // The ToString() method returns a text representation of the object based on all of its settings so diff --git a/Source/EWSPDIData/PDIObjects/VJournal.cs b/Source/EWSPDIData/PDIObjects/VJournal.cs index 7f058ab..9c3915e 100644 --- a/Source/EWSPDIData/PDIObjects/VJournal.cs +++ b/Source/EWSPDIData/PDIObjects/VJournal.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VJournal.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the VJournal object used by iCalendar objects @@ -64,6 +64,7 @@ public class VJournal : RecurringObject // This is a catch-all that holds all unknown or extension properties private CustomPropertyCollection customProps; + #endregion #region Properties @@ -73,10 +74,7 @@ public class VJournal : RecurringObject /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This is used to get the Uniform Resource Locator (URL) property @@ -191,10 +189,7 @@ public TimeStampProperty TimeStamp get { if(timeStamp == null) - { - timeStamp = new TimeStampProperty(); - timeStamp.DateTimeValue = DateTime.Now; - } + timeStamp = new TimeStampProperty { DateTimeValue = DateTime.Now }; return timeStamp; } @@ -411,10 +406,8 @@ public override Duration InstanceDuration /// /// It returns the of the /// property. - public override string TimeZoneId - { - get { return this.StartDateTime.TimeZoneId; } - } + public override string TimeZoneId => this.StartDateTime.TimeZoneId; + #endregion #region Constructor @@ -710,9 +703,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VJournal j = obj as VJournal; - - if(j == null) + if(!(obj is VJournal j)) return false; // The ToString() method returns a text representation of the journal based on all of its settings so diff --git a/Source/EWSPDIData/PDIObjects/VNote.cs b/Source/EWSPDIData/PDIObjects/VNote.cs index d46579c..d3f4786 100644 --- a/Source/EWSPDIData/PDIObjects/VNote.cs +++ b/Source/EWSPDIData/PDIObjects/VNote.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VNote.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2013-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2013-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the vNote object @@ -18,6 +18,8 @@ // 08/19/2007 EFW Created the code //=============================================================================================================== +// Ignore Spelling: vn sw + using System; using System.ComponentModel; using System.Globalization; @@ -63,10 +65,7 @@ public class VNote : PDIObject, ISerializable /// This is used to establish the specification versions supported by the PDI object /// /// Supports IrMC 1.1 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.IrMC11; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.IrMC11; /// /// This is overridden to propagate the version to all properties in the object that need it when the @@ -74,7 +73,7 @@ public override SpecificationVersions VersionsSupported /// public override SpecificationVersions Version { - get { return base.Version; } + get => base.Version; set { base.Version = value; @@ -335,9 +334,7 @@ public void PropagateVersion() /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VNote vn = obj as VNote; - - if(vn == null) + if(!(obj is VNote vn)) return false; // The ToString() method returns a text representation of the vNote based on all of its settings so diff --git a/Source/EWSPDIData/PDIObjects/VNoteCollections.cs b/Source/EWSPDIData/PDIObjects/VNoteCollections.cs index 908d8b7..9fc25b1 100644 --- a/Source/EWSPDIData/PDIObjects/VNoteCollections.cs +++ b/Source/EWSPDIData/PDIObjects/VNoteCollections.cs @@ -18,6 +18,8 @@ // 08/19/2007 EFW Created the code //=============================================================================================================== +// Ignore Spelling: vn sw + using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Source/EWSPDIData/PDIObjects/VTimeZone.cs b/Source/EWSPDIData/PDIObjects/VTimeZone.cs index d1d4c68..42578a0 100644 --- a/Source/EWSPDIData/PDIObjects/VTimeZone.cs +++ b/Source/EWSPDIData/PDIObjects/VTimeZone.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VTimeZone.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/06/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the VTimeZone object used by vCalendar and iCalendar objects @@ -50,6 +50,7 @@ public class VTimeZone : CalendarObject // This is a catch-all that holds all unknown or extension properties private CustomPropertyCollection customProps; + #endregion #region Properties @@ -59,10 +60,7 @@ public class VTimeZone : CalendarObject /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This is used to get the Time Zone ID (TZID) property @@ -154,10 +152,7 @@ public CustomPropertyCollection CustomProperties /// The event arguments protected virtual void OnTimeZoneIdChanged(TimeZoneIdChangedEventArgs e) { - var handler = TimeZoneIdChanged; - - if(handler != null) - handler(this, e); + TimeZoneIdChanged?.Invoke(this, e); } /// @@ -335,9 +330,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VTimeZone tz = obj as VTimeZone; - - if(tz == null) + if(!(obj is VTimeZone tz)) return false; // The ToString() method returns a text representation of the time zone based on all of its settings diff --git a/Source/EWSPDIData/PDIObjects/VToDo.cs b/Source/EWSPDIData/PDIObjects/VToDo.cs index ea49331..bb4e2f8 100644 --- a/Source/EWSPDIData/PDIObjects/VToDo.cs +++ b/Source/EWSPDIData/PDIObjects/VToDo.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VToDo.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/13/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the definition for the VToDo object used by vCalendar and iCalendar objects @@ -83,10 +83,8 @@ public class VToDo : RecurringObject /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This is used to get the Uniform Resource Locator (URL) property @@ -264,10 +262,7 @@ public TimeStampProperty TimeStamp get { if(timeStamp == null) - { - timeStamp = new TimeStampProperty(); - timeStamp.DateTimeValue = DateTime.Now; - } + timeStamp = new TimeStampProperty { DateTimeValue = DateTime.Now }; return timeStamp; } @@ -578,10 +573,8 @@ public override Duration InstanceDuration /// /// It returns the of the /// property. - public override string TimeZoneId - { - get { return this.StartDateTime.TimeZoneId; } - } + public override string TimeZoneId => this.StartDateTime.TimeZoneId; + #endregion #region Constructor @@ -975,9 +968,7 @@ public override void WriteToStream(TextWriter tw, StringBuilder sb) /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - VToDo td = obj as VToDo; - - if(td == null) + if(!(obj is VToDo td)) return false; // The ToString() method returns a text representation of the object based on all of its settings so diff --git a/Source/EWSPDIData/PDIParser/NameToValue.cs b/Source/EWSPDIData/PDIParser/NameToValue.cs index 61131c5..3df1ab1 100644 --- a/Source/EWSPDIData/PDIParser/NameToValue.cs +++ b/Source/EWSPDIData/PDIParser/NameToValue.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : NameToValue.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/13/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to map a property or parameter name string to a an enumerated value @@ -20,7 +20,6 @@ //=============================================================================================================== using System; -using System.Globalization; namespace EWSoftware.PDI.Parser { @@ -33,44 +32,27 @@ namespace EWSoftware.PDI.Parser /// on the item found. public class NameToValue where T : struct { - #region Private data members - //===================================================================== - - private string name; - private T enumValue; - private bool isParamValue; - - #endregion - #region Properties //===================================================================== /// /// This is used to get the property or parameter name string /// - public string Name - { - get { return name; } - } + public string Name { get; } /// /// This is used to get the property or parameter type value /// /// The value should be a member of an enumerated type - public T EnumValue - { - get { return enumValue; } - } + public T EnumValue { get; } /// /// This is used when mapping parameter names and values. It can be used to specify that this item is a /// parameter value rather than a parameter name. /// /// True if the item is a parameter value or false if it is a parameter name - public bool IsParameterValue - { - get { return isParamValue; } - } + public bool IsParameterValue { get; } + #endregion #region Constructors @@ -84,8 +66,8 @@ public bool IsParameterValue /// There are two overloads for the constructor public NameToValue(string itemName, T enumVal) { - name = itemName; - enumValue = enumVal; + this.Name = itemName; + this.EnumValue = enumVal; } /// @@ -96,9 +78,9 @@ public NameToValue(string itemName, T enumVal) /// True if the item is a value rather than a property name public NameToValue(string itemName, T enumVal, bool itemIsValue) { - name = itemName; - enumValue = enumVal; - isParamValue = itemIsValue; + this.Name = itemName; + this.EnumValue = enumVal; + this.IsParameterValue = itemIsValue; } #endregion @@ -117,12 +99,12 @@ public bool IsMatch(string itemName) return false; if(!itemName.EndsWith("=", StringComparison.Ordinal)) - return (String.Compare(itemName, name, StringComparison.OrdinalIgnoreCase) == 0); + return (String.Compare(itemName, this.Name, StringComparison.OrdinalIgnoreCase) == 0); - if(itemName.Length - 1 != name.Length) + if(itemName.Length - 1 != this.Name.Length) return false; - return (String.Compare(itemName, 0, name, 0, name.Length, StringComparison.OrdinalIgnoreCase) == 0); + return (String.Compare(itemName, 0, this.Name, 0, this.Name.Length, StringComparison.OrdinalIgnoreCase) == 0); } #endregion } diff --git a/Source/EWSPDIData/PDIParser/PDIParser.cs b/Source/EWSPDIData/PDIParser/PDIParser.cs index 55e6acc..769e6c4 100644 --- a/Source/EWSPDIData/PDIParser/PDIParser.cs +++ b/Source/EWSPDIData/PDIParser/PDIParser.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PDIParser.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/14/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to parse Personal Data Interchange (PDI) data streams containing vCalendar, @@ -82,9 +82,6 @@ protected enum ParserState // The string collection of parameters. It's re-used to save resources private StringCollection propParams; - // This is used to set the default text encoding used to open a stream - private static Encoding defaultEncoding = new UTF8Encoding(false, false); - #endregion #region Properties @@ -98,19 +95,13 @@ protected enum ParserState /// data stream to alter how text within the stream is interpreted. This parameter has no effect if /// using a parsing method that is passed a stream object. In those cases, it is up to you to open the /// stream with the appropriate text encoding method. - public static Encoding DefaultEncoding - { - get { return defaultEncoding; } - set { defaultEncoding = value; } - } + public static Encoding DefaultEncoding { get; set; } = new UTF8Encoding(false, false); /// /// This returns the current line number being processed from the data stream /// - public int LineNumber - { - get { return lineNbr; } - } + public int LineNumber => lineNbr; + #endregion #region Constructor @@ -599,17 +590,17 @@ public void ParseFile(string filename) { HttpWebRequest wrq = (HttpWebRequest)WebRequest.Create(new Uri(filename)); WebResponse wrsp = wrq.GetResponse(); - sr = new StreamReader(wrsp.GetResponseStream(), defaultEncoding); + sr = new StreamReader(wrsp.GetResponseStream(), DefaultEncoding); } else if(filename.StartsWith("file:", StringComparison.OrdinalIgnoreCase)) { FileWebRequest frq = (FileWebRequest)WebRequest.Create(new Uri(filename)); WebResponse frsp = frq.GetResponse(); - sr = new StreamReader(frsp.GetResponseStream(), defaultEncoding); + sr = new StreamReader(frsp.GetResponseStream(), DefaultEncoding); } else - sr = new StreamReader(filename, defaultEncoding); + sr = new StreamReader(filename, DefaultEncoding); this.ParseReader(sr); } diff --git a/Source/EWSPDIData/PDIParser/PDIParserException.cs b/Source/EWSPDIData/PDIParser/PDIParserException.cs index 9159717..c467c7c 100644 --- a/Source/EWSPDIData/PDIParser/PDIParserException.cs +++ b/Source/EWSPDIData/PDIParser/PDIParserException.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PDIParserException.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/13/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains an exception class thrown by the parsers @@ -31,23 +31,14 @@ namespace EWSoftware.PDI.Parser [Serializable] public class PDIParserException : Exception { - #region Private data members - //===================================================================== - - private int lineNbr; - - #endregion - #region Properties //===================================================================== /// /// This contains the line number in the data stream at which the error occurred /// - public int LineNumber - { - get { return lineNbr; } - } + public int LineNumber { get; } + #endregion #region Constructors @@ -84,7 +75,7 @@ public PDIParserException(string message, Exception inner) : base(message, inner /// The line number in the data stream at which the error occurred public PDIParserException(int line) { - lineNbr = line; + this.LineNumber = line; } /// @@ -94,7 +85,7 @@ public PDIParserException(int line) /// The exception message public PDIParserException(int line, string message) : base(message) { - lineNbr = line; + this.LineNumber = line; } /// @@ -105,7 +96,7 @@ public PDIParserException(int line, string message) : base(message) /// The inner exception public PDIParserException(int line, string message, Exception inner) : base(message, inner) { - lineNbr = line; + this.LineNumber = line; } /// @@ -116,7 +107,7 @@ public PDIParserException(int line, string message, Exception inner) : base(mess protected PDIParserException(SerializationInfo info, StreamingContext context) : base(info, context) { if(info != null) - lineNbr = (int)info.GetValue("LineNumber", typeof(int)); + this.LineNumber = (int)info.GetValue("LineNumber", typeof(int)); } #endregion @@ -135,7 +126,7 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont if(info != null) { base.GetObjectData(info, context); - info.AddValue("LineNumber", lineNbr); + info.AddValue("LineNumber", this.LineNumber); } } #endregion diff --git a/Source/EWSPDIData/PDIParser/VCalendarParser.cs b/Source/EWSPDIData/PDIParser/VCalendarParser.cs index 9c99292..0c30073 100644 --- a/Source/EWSPDIData/PDIParser/VCalendarParser.cs +++ b/Source/EWSPDIData/PDIParser/VCalendarParser.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VCalendarParser.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/14/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to parse vCalendar and iCalendar Personal Data Interchange (PDI) data streams. @@ -20,9 +20,10 @@ // 03/17/2007 EFW Updated for use with .NET 2.0 //=============================================================================================================== +// Ignore Spelling: sr + using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using EWSoftware.PDI.Objects; @@ -331,10 +332,8 @@ protected enum VCalendarParserState /// The calendar from prior calls to the parsing methods is not cleared automatically. Call /// VCalendar.ClearProperties before calling a parsing method if you do not want to retain the /// calendar information from prior runs. - public VCalendar VCalendar - { - get { return vCal; } - } + public VCalendar VCalendar => vCal; + #endregion #region Constructors @@ -359,10 +358,9 @@ public VCalendarParser() /// This is thrown if the specified calendar object is null protected VCalendarParser(VCalendar calendar) : this() { - if(calendar == null) - throw new ArgumentNullException("calendar", LR.GetString("ExParseNullObject", "vCalendar/iCalendar")); + vCal = calendar ?? throw new ArgumentNullException(nameof(calendar), + LR.GetString("ExParseNullObject", "vCalendar/iCalendar")); - vCal = calendar; vCal.ClearProperties(); } #endregion diff --git a/Source/EWSPDIData/PDIParser/VCardParser.cs b/Source/EWSPDIData/PDIParser/VCardParser.cs index cc9acdb..ef52596 100644 --- a/Source/EWSPDIData/PDIParser/VCardParser.cs +++ b/Source/EWSPDIData/PDIParser/VCardParser.cs @@ -2,7 +2,7 @@ // System : Personal Data Interchange Classes // File : VCardParser.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 +// Updated : 11/24/2018 // Note : Copyright 2004-2014, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -20,8 +20,9 @@ // 03/17/2007 EFW Updated for use with .NET 2.0 //=============================================================================================================== +// Ignore Spelling: sr + using System; -using System.Globalization; using System.IO; using EWSoftware.PDI.Objects; @@ -93,10 +94,8 @@ public class VCardParser : PDIParser /// The vCards from prior calls to the parsing methods are not cleared automatically. Call /// VCards.Clear() before calling a parsing method if you do not want to retain the vCards from /// prior runs. - public VCardCollection VCards - { - get { return vCards; } - } + public VCardCollection VCards => vCards; + #endregion #region Constructor @@ -120,10 +119,9 @@ public VCardParser() /// This is thrown if the specified vCard object is null protected VCardParser(VCard vCard) : this() { - if(vCard == null) - throw new ArgumentNullException("vCard", LR.GetString("ExParseNullObject", "vCard")); + currentCard = vCard ?? throw new ArgumentNullException(nameof(vCard), + LR.GetString("ExParseNullObject", "vCard")); - currentCard = vCard; currentCard.ClearProperties(); vCards.Add(vCard); } diff --git a/Source/EWSPDIData/PDIParser/VNoteParser.cs b/Source/EWSPDIData/PDIParser/VNoteParser.cs index 93683fa..11134c9 100644 --- a/Source/EWSPDIData/PDIParser/VNoteParser.cs +++ b/Source/EWSPDIData/PDIParser/VNoteParser.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : VNoteParser.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2007-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2007-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class used to parse vNote Personal Data Interchange (PDI) data streams. It supports @@ -19,8 +19,9 @@ // 08/19/2007 EFW Created the code //=============================================================================================================== +// Ignore Spelling: sr + using System; -using System.Globalization; using System.IO; using EWSoftware.PDI.Objects; @@ -69,10 +70,8 @@ public class VNoteParser : PDIParser /// The vNotes from prior calls to the parsing methods are not cleared automatically. Call /// VNotes.Clear() before calling a parsing method if you do not want to retain the vNotes from /// prior runs. - public VNoteCollection VNotes - { - get { return vNotes; } - } + public VNoteCollection VNotes => vNotes; + #endregion #region Constructors @@ -96,10 +95,9 @@ public VNoteParser() /// This is thrown if the specified vNote object is null protected VNoteParser(VNote vNote) : this() { - if(vNote == null) - throw new ArgumentNullException("vNote", LR.GetString("ExParseNullObject", "vNote")); + currentNote = vNote ?? throw new ArgumentNullException(nameof(vNote), + LR.GetString("ExParseNullObject", "vNote")); - currentNote = vNote; currentNote.ClearProperties(); vNotes.Add(vNote); } diff --git a/Source/EWSPDIData/PDIProperties/ActionProperty.cs b/Source/EWSPDIData/PDIProperties/ActionProperty.cs index b40f58a..135bc25 100644 --- a/Source/EWSPDIData/PDIProperties/ActionProperty.cs +++ b/Source/EWSPDIData/PDIProperties/ActionProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ActionProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Action property used by the Personal Data Interchange (PDI) vCalendar and iCalendar @@ -36,6 +36,7 @@ public class ActionProperty : BaseProperty private AlarmAction alarmAction; private string otherAction; + #endregion #region Properties @@ -45,26 +46,18 @@ public class ActionProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (ACTION) /// - public override string Tag - { - get { return "ACTION"; } - } + public override string Tag => "ACTION"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the alarm action value @@ -73,7 +66,7 @@ public override string DefaultValueLocation /// if not already set to something else. It is set to null if set to any other alarm action. public AlarmAction Action { - get { return alarmAction; } + get => alarmAction; set { alarmAction = value; @@ -82,7 +75,7 @@ public AlarmAction Action otherAction = null; else if(String.IsNullOrWhiteSpace(otherAction)) - otherAction = "X-UNKNOWN"; + otherAction = "X-UNKNOWN"; } } @@ -94,7 +87,7 @@ public AlarmAction Action /// Other. public string OtherAction { - get { return otherAction; } + get => otherAction; set { alarmAction = AlarmAction.Other; @@ -160,8 +153,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/AddressProperty.cs b/Source/EWSPDIData/PDIProperties/AddressProperty.cs index 3c4b9e4..cbccf86 100644 --- a/Source/EWSPDIData/PDIProperties/AddressProperty.cs +++ b/Source/EWSPDIData/PDIProperties/AddressProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : AddressProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Address property. It is used with the Personal Data Interchange (PDI) vCard class @@ -67,26 +67,18 @@ public class AddressProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (ADR) /// - public override string Tag - { - get { return "ADR"; } - } + public override string Tag => "ADR"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the address type flags @@ -271,10 +263,7 @@ public override string EncodedValue return addrValue; } - set - { - this.Value = (value == null) ? value : base.Decode(value); - } + set => this.Value = (value == null) ? value : base.Decode(value); } #endregion diff --git a/Source/EWSPDIData/PDIProperties/AddressPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/AddressPropertyCollection.cs index 95e4b19..8405501 100644 --- a/Source/EWSPDIData/PDIProperties/AddressPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/AddressPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : AddressPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for AddressProperty objects. It is used with the Personal Data @@ -82,7 +82,7 @@ public void SetPreferred(AddressProperty address) int idx = base.IndexOf(address); if(idx == -1) - throw new ArgumentOutOfRangeException("address", address, LR.GetString("ExAddrNotInCollection")); + throw new ArgumentOutOfRangeException(nameof(address), address, LR.GetString("ExAddrNotInCollection")); this.SetPreferred(idx); } @@ -96,7 +96,7 @@ public void SetPreferred(AddressProperty address) public void SetPreferred(int idx) { if(idx < 0 || idx > base.Count) - throw new ArgumentOutOfRangeException("idx", idx, LR.GetString("ExAddrInvalidIndex")); + throw new ArgumentOutOfRangeException(nameof(idx), idx, LR.GetString("ExAddrInvalidIndex")); for(int addrIdx = 0; addrIdx < base.Count; addrIdx++) if(addrIdx == idx) diff --git a/Source/EWSPDIData/PDIProperties/AgentProperty.cs b/Source/EWSPDIData/PDIProperties/AgentProperty.cs index 17fc319..af6187d 100644 --- a/Source/EWSPDIData/PDIProperties/AgentProperty.cs +++ b/Source/EWSPDIData/PDIProperties/AgentProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : AgentProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Agent property. It is used with the Personal Data Interchange (PDI) classes such as @@ -38,6 +38,7 @@ public class AgentProperty : BaseProperty //===================================================================== private VCard agent; + #endregion #region Properties @@ -47,26 +48,18 @@ public class AgentProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (AGENT) /// - public override string Tag - { - get { return "AGENT"; } - } + public override string Tag => "AGENT"; /// /// This read-only property defines the default value location as INLINE /// - public override string DefaultValueLocation - { - get { return ValLocValue.Inline; } - } + public override string DefaultValueLocation => ValLocValue.Inline; /// /// This is used to set or get the vCard represented by the agent property @@ -77,7 +70,7 @@ public override string DefaultValueLocation /// object, the location is forced to be inline. public VCard VCard { - get { return agent; } + get => agent; set { agent = value; diff --git a/Source/EWSPDIData/PDIProperties/AgentPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/AgentPropertyCollection.cs index fde50ac..d538891 100644 --- a/Source/EWSPDIData/PDIProperties/AgentPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/AgentPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : AgentPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for AgentProperty objects. It is used with the Personal Data @@ -64,8 +64,8 @@ public AgentPropertyCollection(IList agents) : base(agents) /// Returns the new property that was created and added to the collection public AgentProperty Add(VCard vCard) { - AgentProperty a = new AgentProperty(); - a.VCard = vCard; + AgentProperty a = new AgentProperty { VCard = vCard }; + base.Add(a); return a; diff --git a/Source/EWSPDIData/PDIProperties/AttachProperty.cs b/Source/EWSPDIData/PDIProperties/AttachProperty.cs index 42ce356..466cd81 100644 --- a/Source/EWSPDIData/PDIProperties/AttachProperty.cs +++ b/Source/EWSPDIData/PDIProperties/AttachProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : BinaryProperties.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Attach property that support binary encoded attachments. It is used with the Personal @@ -20,7 +20,6 @@ //=============================================================================================================== using System; -using System.Globalization; using System.Text; namespace EWSoftware.PDI.Properties @@ -42,26 +41,18 @@ public class AttachProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (ATTACH) /// - public override string Tag - { - get { return "ATTACH"; } - } + public override string Tag => "ATTACH"; /// /// This read-only property defines the default value type as URI /// - public override string DefaultValueLocation - { - get { return ValLocValue.Uri; } - } + public override string DefaultValueLocation => ValLocValue.Uri; /// /// This is used to set or get the attachment format type diff --git a/Source/EWSPDIData/PDIProperties/AttendeeProperty.cs b/Source/EWSPDIData/PDIProperties/AttendeeProperty.cs index 84b18ca..372eaad 100644 --- a/Source/EWSPDIData/PDIProperties/AttendeeProperty.cs +++ b/Source/EWSPDIData/PDIProperties/AttendeeProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : AttendeeProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Attendee property used by the vCalendar and iCalendar classes @@ -19,7 +19,6 @@ //=============================================================================================================== using System; -using System.Globalization; using System.Text; using EWSoftware.PDI.Parser; @@ -45,8 +44,6 @@ public class AttendeeProperty : OrganizerProperty //===================================================================== private StringCollection delFrom, delTo, member; - private string role, status, expect, cuType; - private bool rsvp; // This is used to map parameter name and value strings to a ParameterType enumeration private static NameToValue[] ntv = { @@ -89,18 +86,13 @@ public class AttendeeProperty : OrganizerProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (ATTENDEE) /// - public override string Tag - { - get { return "ATTENDEE"; } - } + public override string Tag => "ATTENDEE"; /// /// This property is used to set or get the calendar user type (CUTYPE) parameter for the calendar user @@ -108,22 +100,14 @@ public override string Tag /// /// This parameter is only applicable to iCalendar 2.0 objects. It is used to define the type of /// calendar user specified by the property such as INDIVIDUAL, GROUP, RESOURCE, etc. - public string CalendarUserType - { - get { return cuType; } - set { cuType = value; } - } + public string CalendarUserType { get; set; } /// /// This property is used to set or get the calendar user expectation (EXPECT) parameter for the calendar /// user specified by the property value. /// /// This parameter is only applicable to vCalendar 1.0 objects - public string Expectation - { - get { return expect; } - set { expect = value; } - } + public string Expectation { get; set; } /// /// This property is used to set or get the "delegated from" (DELEGATED-FROM) parameters for the calendar @@ -181,33 +165,22 @@ public StringCollection Membership /// property value. /// /// This parameter is applicable to vCalendar and iCalendar objects - public string Role - { - get { return role; } - set { role = value; } - } + public string Role { get; set; } /// /// This property is used to set or get the participation status parameter (STATUS for vCalendar, /// PART-STATUS for iCalendar) for the calendar user specified by the property value. /// /// This parameter is applicable to vCalendar and iCalendar objects - public string ParticipationStatus - { - get { return status; } - set { status = value; } - } + public string ParticipationStatus { get; set; } /// /// This property is used to set or get the RSVP (RSVP) parameter for the calendar user specified by the /// property value. /// /// This parameter is applicable to vCalendar and iCalendar objects - public bool Rsvp - { - get { return rsvp; } - set { rsvp = value; } - } + public bool Rsvp { get; set; } + #endregion #region Constructor @@ -243,11 +216,11 @@ protected override void Clone(PDIObject p) { AttendeeProperty a = (AttendeeProperty)p; - cuType = a.CalendarUserType; - expect = a.Expectation; - role = a.Role; - status = a.ParticipationStatus; - rsvp = a.Rsvp; + this.CalendarUserType = a.CalendarUserType; + this.Expectation = a.Expectation; + this.Role = a.Role; + this.ParticipationStatus = a.ParticipationStatus; + this.Rsvp = a.Rsvp; this.DelegatedFrom.Clear(); this.DelegatedTo.Clear(); @@ -276,12 +249,12 @@ public override void SerializeParameters(StringBuilder sb) // Serialize the extra parameters if necessary if(this.Version == SpecificationVersions.iCalendar20) { - if(cuType != null && cuType.Length != 0) + if(this.CalendarUserType != null && this.CalendarUserType.Length != 0) { sb.Append(';'); sb.Append(ParameterNames.CalendarUserType); sb.Append('='); - sb.Append(cuType); + sb.Append(this.CalendarUserType); } // Delegated From values are always enclosed in quotes @@ -338,15 +311,15 @@ public override void SerializeParameters(StringBuilder sb) } } - if(status != null && status.Length != 0) + if(this.ParticipationStatus != null && this.ParticipationStatus.Length != 0) { sb.Append(';'); sb.Append(ParameterNames.PartStatus); sb.Append('='); - sb.Append(status); + sb.Append(this.ParticipationStatus); } - if(rsvp) + if(this.Rsvp) { sb.Append(';'); sb.Append(ParameterNames.Rsvp); @@ -355,23 +328,23 @@ public override void SerializeParameters(StringBuilder sb) } else { - if(expect != null && expect.Length != 0) + if(this.Expectation != null && this.Expectation.Length != 0) { sb.Append(';'); sb.Append(ParameterNames.Expect); sb.Append('='); - sb.Append(expect); + sb.Append(this.Expectation); } - if(status != null && status.Length != 0) + if(this.ParticipationStatus != null && this.ParticipationStatus.Length != 0) { sb.Append(';'); sb.Append(ParameterNames.Status); sb.Append('='); - sb.Append(status); + sb.Append(this.ParticipationStatus); } - if(rsvp) + if(this.Rsvp) { sb.Append(';'); sb.Append(ParameterNames.Rsvp); @@ -379,12 +352,12 @@ public override void SerializeParameters(StringBuilder sb) } } - if(role != null && role.Length != 0) + if(this.Role != null && this.Role.Length != 0) { sb.Append(';'); sb.Append(ParameterNames.Role); sb.Append('='); - sb.Append(role); + sb.Append(this.Role); } } @@ -424,7 +397,7 @@ public override void DeserializeParameters(StringCollection parameters) parameters.RemoveAt(paramIdx); if(paramIdx < parameters.Count) - role = parameters[paramIdx]; + this.Role = parameters[paramIdx]; break; case ParameterType.Rsvp: @@ -435,7 +408,7 @@ public override void DeserializeParameters(StringCollection parameters) { tempVal = parameters[paramIdx].Trim(); - rsvp = (String.Compare(tempVal, "YES", StringComparison.OrdinalIgnoreCase) == 0 || + this.Rsvp = (String.Compare(tempVal, "YES", StringComparison.OrdinalIgnoreCase) == 0 || String.Compare(tempVal, "TRUE", StringComparison.OrdinalIgnoreCase) == 0); } break; @@ -445,7 +418,7 @@ public override void DeserializeParameters(StringCollection parameters) parameters.RemoveAt(paramIdx); if(paramIdx < parameters.Count) - expect = parameters[paramIdx]; + this.Expectation = parameters[paramIdx]; break; case ParameterType.CalendarUserType: @@ -453,7 +426,7 @@ public override void DeserializeParameters(StringCollection parameters) parameters.RemoveAt(paramIdx); if(paramIdx < parameters.Count) - cuType = parameters[paramIdx]; + this.CalendarUserType = parameters[paramIdx]; break; case ParameterType.DelegatedFrom: @@ -521,7 +494,7 @@ public override void DeserializeParameters(StringCollection parameters) parameters.RemoveAt(paramIdx); if(paramIdx < parameters.Count) - status = parameters[paramIdx]; + this.ParticipationStatus = parameters[paramIdx]; break; } diff --git a/Source/EWSPDIData/PDIProperties/AttendeePropertyCollection.cs b/Source/EWSPDIData/PDIProperties/AttendeePropertyCollection.cs index bc19407..4e78b24 100644 --- a/Source/EWSPDIData/PDIProperties/AttendeePropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/AttendeePropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : AttendeeProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for AttendeeProperty objects @@ -63,8 +63,8 @@ public AttendeePropertyCollection(IList attendees) : base(atte /// There are two overloads for this method public AttendeeProperty Add(string attendee) { - AttendeeProperty a = new AttendeeProperty(); - a.Value = attendee; + AttendeeProperty a = new AttendeeProperty { Value = attendee }; + base.Add(a); return a; @@ -79,9 +79,8 @@ public AttendeeProperty Add(string attendee) /// Returns the new property that was created and added to the collection public AttendeeProperty Add(string attendee, string commonName) { - AttendeeProperty a = new AttendeeProperty(); - a.Value = attendee; - a.CommonName = commonName; + AttendeeProperty a = new AttendeeProperty { Value = attendee, CommonName = commonName }; + base.Add(a); return a; diff --git a/Source/EWSPDIData/PDIProperties/BaseDateTimeProperty.cs b/Source/EWSPDIData/PDIProperties/BaseDateTimeProperty.cs index fb2085f..7a63ec8 100644 --- a/Source/EWSPDIData/PDIProperties/BaseDateTimeProperty.cs +++ b/Source/EWSPDIData/PDIProperties/BaseDateTimeProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : BaseDateTimeProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains an abstract base date/time property class used to create the other date/time property @@ -41,7 +41,6 @@ public abstract class BaseDateTimeProperty : BaseProperty private DateTime propDate; private string timeZoneId; - private bool isFloating; #endregion @@ -60,11 +59,7 @@ public abstract class BaseDateTimeProperty : BaseProperty /// that is not dependent on any particular time zone. It will be interpreted as a local time regardless /// of the system's current time zone. It will not be converted to/from universal time by the /// property. - public bool IsFloating - { - get { return isFloating; } - set { isFloating = value; } - } + public bool IsFloating { get; set; } /// /// This is used to get or set the time zone ID (TZID) parameter value @@ -75,7 +70,7 @@ public bool IsFloating /// the owning calendar. If set, the property is ignored. public string TimeZoneId { - get { return timeZoneId; } + get => timeZoneId; set { if(!String.IsNullOrWhiteSpace(value)) @@ -94,8 +89,8 @@ public string TimeZoneId /// public virtual DateTime TimeZoneDateTime { - get { return propDate; } - set { propDate = value; } + get => propDate; + set => propDate = value; } /// @@ -195,7 +190,7 @@ public override string Value if(this.Version == SpecificationVersions.vCard30) { // Floating uses the local time format - if(isFloating) + if(this.IsFloating) format = ISO8601Format.ExtendedDateTimeLocal; else { @@ -207,7 +202,7 @@ public override string Value { // iCalendar with time zone parameter uses local time format. So does a floating // date/time. - if(isFloating || (this.Version == SpecificationVersions.iCalendar20 && timeZoneId != null)) + if(this.IsFloating || (this.Version == SpecificationVersions.iCalendar20 && timeZoneId != null)) format = ISO8601Format.BasicDateTimeLocal; else { @@ -221,14 +216,14 @@ public override string Value } set { - isFloating = false; + this.IsFloating = false; if(value != null && value.Length > 0) { propDate = DateUtils.FromISO8601String(value, true); if(this.ValueLocation == ValLocValue.DateTime && timeZoneId == null) - isFloating = DateUtils.IsFloatingFormat(value); + this.IsFloating = DateUtils.IsFloatingFormat(value); } else propDate = DateTime.MinValue; @@ -240,8 +235,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/BaseProperty.cs b/Source/EWSPDIData/PDIProperties/BaseProperty.cs index d15c6ba..01b9b37 100644 --- a/Source/EWSPDIData/PDIProperties/BaseProperty.cs +++ b/Source/EWSPDIData/PDIProperties/BaseProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : BaseProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the base property class used by the Personal Data Interchange (PDI) classes such as @@ -21,7 +21,6 @@ //=============================================================================================================== using System; -using System.Globalization; using System.IO; using System.Text; @@ -39,17 +38,11 @@ public abstract class BaseProperty : PDIObject #region Private data members //===================================================================== - // This is used for the default text encoding when reading and writing properties with a non-ASCII - // CHARSET parameter. - private static Encoding defaultEncoding = new ASCIIEncoding(); - private string propValue, // The value of the property - groupName, // The group to which this property belongs encMethod, // The encoding method used on the property value charSet, // The character set used for the property value language, // The language used for the property value - location, // The data type/location of the property value - customParams; // Custom parameters + location; // The data type/location of the property value private EncodingType encType; // This is kept in sync with encMethod @@ -93,11 +86,7 @@ public abstract class BaseProperty : PDIObject /// data stream to alter how text with non-ASCII CHARSET properties are interpreted. In general, this /// property is only useful with vCard 2.1 and vCalendar 1.0 objects as they are the only ones that make /// use of the CHARSET parameter. - public static Encoding DefaultEncoding - { - get { return defaultEncoding; } - set { defaultEncoding = value; } - } + public static Encoding DefaultEncoding { get; set; } = new ASCIIEncoding(); /// /// This read-only property must be specified to define the tag used for the property (i.e. FN, N, ADR, @@ -118,7 +107,7 @@ public static Encoding DefaultEncoding /// B Encoding is only used by vCard 3.0. All other specifications use Base 64 Encoding. public override SpecificationVersions Version { - get { return base.Version; } + get => base.Version; set { base.Version = value; @@ -130,7 +119,7 @@ public override SpecificationVersions Version } else if(this.EncodingMethod == EncodingType.BEncoding) - this.EncodingMethod = EncodingType.Base64; + this.EncodingMethod = EncodingType.Base64; } } @@ -140,11 +129,7 @@ public override SpecificationVersions Version /// vCard properties support grouping. If grouped, this property will contain the name of the /// group with which it is associated. This property is ignored for vCalendar and iCalendar /// properties. - public string Group - { - get { return groupName; } - set { groupName = value; } - } + public string Group { get; set; } /// /// Set or get the encoding method for this property's value as a string @@ -155,7 +140,7 @@ public string Group /// QUOTED-PRINTABLE, BASE64, B, or a value starting with "X-" to indicate a custom type. public string EncodingString { - get { return encMethod; } + get => encMethod; set { if(value == null || value.Length == 0) @@ -203,7 +188,7 @@ public string EncodingString /// encoding. public EncodingType EncodingMethod { - get { return encType; } + get => encType; set { encType = value; @@ -248,7 +233,7 @@ public EncodingType EncodingMethod /// vCalendar 1.0 specification. It is ignored by all other specifications. public string CharacterSet { - get { return charSet; } + get => charSet; set { if(value == null || value.Length == 0) @@ -265,7 +250,7 @@ public string CharacterSet /// defined in RFC 1766 but the class does not enforce this through validation. public string Language { - get { return language; } + get => language; set { if(!String.IsNullOrWhiteSpace(value)) @@ -287,10 +272,7 @@ public string Language /// location/type (i.e. Base64 for binary, 7-bit for non-binary data, etc). public string ValueLocation { - get - { - return (location == null) ? this.DefaultValueLocation : location; - } + get => location ?? this.DefaultValueLocation; set { if(value == null || value.Length == 0) @@ -317,11 +299,7 @@ public string ValueLocation /// The parameters are returned in a string containing each parameter and its value separated by /// semi-colons (i.e. "X-ABC-Custom1=Value;X-ABC-Custom2=3". It is up to the caller to determine what to /// do with them. It can be overridden in derived classes to alter its behavior. - public virtual string CustomParameters - { - get { return customParams; } - set { customParams = value; } - } + public virtual string CustomParameters { get; set; } /// /// This is used to set or get the value of the property in its unencoded string form @@ -339,8 +317,8 @@ public virtual string CustomParameters /// value is stored correctly in either form. public virtual string Value { - get { return propValue; } - set { propValue = value; } + get => propValue; + set => propValue = value; } /// @@ -370,7 +348,7 @@ public virtual string EncodedValue return this.Encode(propValue); } - set { propValue = this.Decode(value); } + set => propValue = this.Decode(value); } #endregion @@ -484,9 +462,7 @@ public static void WriteToStream(BaseProperty prop, StringBuilder sb, TextWriter /// Returns true if the object equals this instance, false if it does not public override bool Equals(object obj) { - BaseProperty bp = obj as BaseProperty; - - if(bp == null) + if(!(obj is BaseProperty bp)) return false; // The ToString() method returns a text representation of the property based on all of its settings @@ -549,7 +525,7 @@ public void ToString(StringBuilder sb) // Prefix the property with the group name if there is one if(this.Group != null && this.Group.Length != 0) { - sb.Append(groupName); + sb.Append(this.Group); sb.Append('.'); } @@ -870,7 +846,7 @@ public virtual string Encode(string data) String.Compare(this.CharacterSet, CharSetValue.ASCII, StringComparison.OrdinalIgnoreCase) != 0) { Encoding destEnc = Encoding.GetEncoding(this.CharacterSet); - byte[] destBytes = Encoding.Convert(defaultEncoding, destEnc, defaultEncoding.GetBytes(data)); + byte[] destBytes = Encoding.Convert(DefaultEncoding, destEnc, DefaultEncoding.GetBytes(data)); // Use the literal bytes. If we get the string, the encoder gives us the decoded values which is // not what we want to write out. @@ -963,8 +939,8 @@ public virtual string Decode(string data) Encoding enc = Encoding.GetEncoding("iso-8859-1"); byte[] srcBytes = enc.GetBytes(decoded); - decoded = defaultEncoding.GetString(Encoding.Convert(Encoding.GetEncoding(this.CharacterSet), - defaultEncoding, srcBytes)); + decoded = DefaultEncoding.GetString(Encoding.Convert(Encoding.GetEncoding(this.CharacterSet), + DefaultEncoding, srcBytes)); } return decoded; diff --git a/Source/EWSPDIData/PDIProperties/BirthDateProperty.cs b/Source/EWSPDIData/PDIProperties/BirthDateProperty.cs index 611f226..0f00359 100644 --- a/Source/EWSPDIData/PDIProperties/BirthDateProperty.cs +++ b/Source/EWSPDIData/PDIProperties/BirthDateProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : BirthDateProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Birth Date property class used by the Personal Data Interchange (PDI) vCard classes @@ -35,26 +35,19 @@ public class BirthDateProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (BDAY) /// - public override string Tag - { - get { return "BDAY"; } - } + public override string Tag => "BDAY"; /// /// This read-only property defines the default value type as DATE /// - public override string DefaultValueLocation - { - get { return ValLocValue.Date; } - } + public override string DefaultValueLocation => ValLocValue.Date; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/BodyProperty.cs b/Source/EWSPDIData/PDIProperties/BodyProperty.cs index a1f90b8..3128094 100644 --- a/Source/EWSPDIData/PDIProperties/BodyProperty.cs +++ b/Source/EWSPDIData/PDIProperties/BodyProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : BodyProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2007-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2007-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Body property. It is used with the Personal Data Interchange (PDI) vNote class. @@ -35,26 +35,18 @@ public class BodyProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports IrMC 1.1 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.IrMC11; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.IrMC11; /// /// This read-only property defines the tag (BODY) /// - public override string Tag - { - get { return "BODY"; } - } + public override string Tag => "BODY"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/CalendarScaleProperty.cs b/Source/EWSPDIData/PDIProperties/CalendarScaleProperty.cs index a844900..24390e1 100644 --- a/Source/EWSPDIData/PDIProperties/CalendarScaleProperty.cs +++ b/Source/EWSPDIData/PDIProperties/CalendarScaleProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : CalendarScaleProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Calendar Scale property used by the Personal Data Interchange (PDI) iCalendar classes @@ -36,26 +36,18 @@ public class CalendarScaleProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (CALSCALE) /// - public override string Tag - { - get { return "CALSCALE"; } - } + public override string Tag => "CALSCALE"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/CategoriesProperty.cs b/Source/EWSPDIData/PDIProperties/CategoriesProperty.cs index 350acaf..03646e2 100644 --- a/Source/EWSPDIData/PDIProperties/CategoriesProperty.cs +++ b/Source/EWSPDIData/PDIProperties/CategoriesProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : CategoriesProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Categories property class used by the Personal Data Interchange (PDI) classes such as @@ -41,6 +41,7 @@ public class CategoriesProperty : BaseProperty private static Regex reSplit = new Regex(@"(?:^[,;])|(?<=(?:[^\\]))[,;]"); private StringCollection categories; + #endregion #region Properties @@ -50,36 +51,24 @@ public class CategoriesProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 3.0, vCalendar 1.0, iCalendar 2.0, and IrMC 1.1. - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard30 | SpecificationVersions.vCalendar10 | - SpecificationVersions.iCalendar20 | SpecificationVersions.IrMC11; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard30 | + SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20 | SpecificationVersions.IrMC11; /// /// This read-only property defines the tag (CATEGORIES) /// - public override string Tag - { - get { return "CATEGORIES"; } - } + public override string Tag => "CATEGORIES"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to get the categories string collection /// /// Categories can be added to or removed from the returned collection reference - public StringCollection Categories - { - get { return categories; } - } + public StringCollection Categories => categories; /// /// This property is used to set or get the categories as a string value @@ -88,7 +77,7 @@ public StringCollection Categories /// will be split and loaded into the categories string collection. public string CategoriesString { - get { return String.Join(", ", categories); } + get => String.Join(", ", categories); set { string tempCat; @@ -169,8 +158,8 @@ public override string Value /// The categories are escaped as needed public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/ClassificationProperty.cs b/Source/EWSPDIData/PDIProperties/ClassificationProperty.cs index 5ae729c..441344c 100644 --- a/Source/EWSPDIData/PDIProperties/ClassificationProperty.cs +++ b/Source/EWSPDIData/PDIProperties/ClassificationProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ClassificationProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains Classification property class used by the Personal Data Interchange (PDI) classes such as @@ -41,27 +41,19 @@ public class ClassificationProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 3.0, vCalendar 1.0, iCalendar 2.0, and IrMC 1.1 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard30 | SpecificationVersions.vCalendar10 | - SpecificationVersions.iCalendar20 | SpecificationVersions.IrMC11; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard30 | + SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20 | SpecificationVersions.IrMC11; /// /// This read-only property defines the tag (CLASS) /// - public override string Tag - { - get { return "CLASS"; } - } + public override string Tag => "CLASS"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/CommentProperty.cs b/Source/EWSPDIData/PDIProperties/CommentProperty.cs index c5b80b5..4e51968 100644 --- a/Source/EWSPDIData/PDIProperties/CommentProperty.cs +++ b/Source/EWSPDIData/PDIProperties/CommentProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : CommentProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Comment property class used by the Personal Data Interchange (PDI) vCalendar and @@ -37,26 +37,18 @@ public class CommentProperty : BaseAltRepProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (COMMENT) /// - public override string Tag - { - get { return "COMMENT"; } - } + public override string Tag => "COMMENT"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/CompletedDateProperty.cs b/Source/EWSPDIData/PDIProperties/CompletedDateProperty.cs index 8e7c370..35e5893 100644 --- a/Source/EWSPDIData/PDIProperties/CompletedDateProperty.cs +++ b/Source/EWSPDIData/PDIProperties/CompletedDateProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : CompletedDateProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Completed Date property class used by the Personal Data Interchange (PDI) vCalendar and @@ -41,26 +41,18 @@ public class CompletedDateProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (COMPLETED) /// - public override string Tag - { - get { return "COMPLETED"; } - } + public override string Tag => "COMPLETED"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; /// /// This property does not allow a time zone and is always a UTC date/time value @@ -78,7 +70,7 @@ public override string Value return dtDate.ToUniversalTime().ToString(ISO8601Format.BasicDateTimeUniversal, CultureInfo.InvariantCulture); } - set { base.Value = value; } + set => base.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/ContactProperty.cs b/Source/EWSPDIData/PDIProperties/ContactProperty.cs index 1c1b3ab..601c453 100644 --- a/Source/EWSPDIData/PDIProperties/ContactProperty.cs +++ b/Source/EWSPDIData/PDIProperties/ContactProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ContactProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Contact property. It is used with the iCalendar Personal Data Interchange (PDI) @@ -37,26 +37,18 @@ public class ContactProperty : BaseAltRepProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (CONTACT) /// - public override string Tag - { - get { return "CONTACT"; } - } + public override string Tag => "CONTACT"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/ContactPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/ContactPropertyCollection.cs index fd878ec..e35cbbf 100644 --- a/Source/EWSPDIData/PDIProperties/ContactPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/ContactPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ContactPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for ContactProperty objects. It is used with the iCalendar Personal @@ -63,8 +63,8 @@ public ContactPropertyCollection(IList contacts) : base(contact /// Returns the new property that was created and added to the collection public ContactProperty Add(string contact) { - ContactProperty c = new ContactProperty(); - c.Value = contact; + ContactProperty c = new ContactProperty { Value = contact }; + base.Add(c); return c; diff --git a/Source/EWSPDIData/PDIProperties/CustomProperty.cs b/Source/EWSPDIData/PDIProperties/CustomProperty.cs index 4e60225..6258020 100644 --- a/Source/EWSPDIData/PDIProperties/CustomProperty.cs +++ b/Source/EWSPDIData/PDIProperties/CustomProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : CustomProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the custom property class. It is used with the Personal Data Interchange (PDI) classes @@ -45,26 +45,18 @@ public class CustomProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports all specifications - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.Any | SpecificationVersions.IrMC11; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.Any | + SpecificationVersions.IrMC11; /// /// This read-only property defines the tag which is the value of the property /// - public override string Tag - { - get { return this.CustomName; } - } + public override string Tag => this.CustomName; /// /// This read-only property defines the default value location as INLINE /// - public override string DefaultValueLocation - { - get { return ValLocValue.Inline; } - } + public override string DefaultValueLocation => ValLocValue.Inline; /// /// This contains the name of the custom property @@ -83,7 +75,7 @@ public string CustomName set { if(String.IsNullOrWhiteSpace(value)) - throw new ArgumentNullException("value", LR.GetString("ExCustomNoName")); + throw new ArgumentNullException(nameof(value), LR.GetString("ExCustomNoName")); customName = value; } @@ -96,8 +88,8 @@ public string CustomName /// get passed through unchanged. public override string EncodedValue { - get { return base.Value; } - set { base.Value = value; } + get => base.Value; + set => base.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/CustomPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/CustomPropertyCollection.cs index 0afe746..79486a4 100644 --- a/Source/EWSPDIData/PDIProperties/CustomPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/CustomPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : CustomProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/18/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for CustomProperty objects. It is used with the Personal Data @@ -23,7 +23,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Globalization; using EWSoftware.PDI.Binding; @@ -101,8 +100,8 @@ public CustomProperty this[string propertyName] /// Returns the newly created custom property public CustomProperty Add(string tag, string propertyValue) { - CustomProperty cprop = new CustomProperty(tag); - cprop.Value = propertyValue; + CustomProperty cprop = new CustomProperty(tag) { Value = propertyValue }; + base.Add(cprop); return cprop; diff --git a/Source/EWSPDIData/PDIProperties/DateCreatedProperty.cs b/Source/EWSPDIData/PDIProperties/DateCreatedProperty.cs index 0ca2a8d..b9dba29 100644 --- a/Source/EWSPDIData/PDIProperties/DateCreatedProperty.cs +++ b/Source/EWSPDIData/PDIProperties/DateCreatedProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : DateCreatedProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Date Created property class used by the Personal Data Interchange (PDI) vCalendar and @@ -42,11 +42,8 @@ public class DateCreatedProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0, iCalendar 2.0, and IrMC 1.1 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20 | - SpecificationVersions.IrMC11; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20 | SpecificationVersions.IrMC11; /// /// This read-only property defines the tag (DCREATED for vCalendar and VNOTE, CREATED for iCalendar) @@ -65,10 +62,7 @@ public override string Tag /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; /// /// This property does not allow a time zone and is always a UTC date/time value @@ -85,7 +79,7 @@ public override string Value return dtDate.ToUniversalTime().ToString(ISO8601Format.BasicDateTimeUniversal, CultureInfo.InvariantCulture); } - set { base.Value = value; } + set => base.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/DaylightProperty.cs b/Source/EWSPDIData/PDIProperties/DaylightProperty.cs index 5378410..7250556 100644 --- a/Source/EWSPDIData/PDIProperties/DaylightProperty.cs +++ b/Source/EWSPDIData/PDIProperties/DaylightProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : DaylightProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Daylight property used by the Personal Data Interchange (PDI) vCalendar classes @@ -42,26 +42,17 @@ public class DaylightProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10; /// /// This read-only property defines the tag (DAYLIGHT) /// - public override string Tag - { - get { return "DAYLIGHT"; } - } + public override string Tag => "DAYLIGHT"; /// /// This read-only property defines the default value location as INLINE /// - public override string DefaultValueLocation - { - get { return ValLocValue.Inline; } - } + public override string DefaultValueLocation => ValLocValue.Inline; /// /// This property is used to set or get the daylight saving time flag @@ -170,8 +161,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/DescriptionProperty.cs b/Source/EWSPDIData/PDIProperties/DescriptionProperty.cs index fbe492b..0bf3d70 100644 --- a/Source/EWSPDIData/PDIProperties/DescriptionProperty.cs +++ b/Source/EWSPDIData/PDIProperties/DescriptionProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : DescriptionProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Description property class used by the Personal Data Interchange (PDI) vCalendar and @@ -37,26 +37,19 @@ public class DescriptionProperty : BaseAltRepProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (DESCRIPTION) /// - public override string Tag - { - get { return "DESCRIPTION"; } - } + public override string Tag => "DESCRIPTION"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/DueDateProperty.cs b/Source/EWSPDIData/PDIProperties/DueDateProperty.cs index 20c1a57..9aec829 100644 --- a/Source/EWSPDIData/PDIProperties/DueDateProperty.cs +++ b/Source/EWSPDIData/PDIProperties/DueDateProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : DueDateProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Due Date property class used by the Personal Data Interchange (PDI) vCalendar and @@ -36,26 +36,19 @@ public class DueDateProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (DUE) /// - public override string Tag - { - get { return "DUE"; } - } + public override string Tag => "DUE"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/DurationProperty.cs b/Source/EWSPDIData/PDIProperties/DurationProperty.cs index b8b91ae..f8ac546 100644 --- a/Source/EWSPDIData/PDIProperties/DurationProperty.cs +++ b/Source/EWSPDIData/PDIProperties/DurationProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : DurationProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Duration property class used by the Personal Data Interchange (PDI) vCalendar and @@ -38,26 +38,18 @@ public class DurationProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (DURATION) /// - public override string Tag - { - get { return "DURATION"; } - } + public override string Tag => "DURATION"; /// /// This read-only property defines the default value type as DURATION /// - public override string DefaultValueLocation - { - get { return ValLocValue.Duration; } - } + public override string DefaultValueLocation => ValLocValue.Duration; /// /// This allows the duration to be set or retrieved as a object @@ -79,7 +71,7 @@ public override string Value return this.DurationValue.ToString(Duration.MaxUnit.Weeks); } - set { this.DurationValue = new Duration(value); } + set => this.DurationValue = new Duration(value); } /// @@ -87,8 +79,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/EMailProperty.cs b/Source/EWSPDIData/PDIProperties/EMailProperty.cs index ed247f2..e4067c1 100644 --- a/Source/EWSPDIData/PDIProperties/EMailProperty.cs +++ b/Source/EWSPDIData/PDIProperties/EMailProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : EMailProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the e-mail property class. It is used with the Personal Data Interchange (PDI) vCard @@ -28,16 +28,14 @@ namespace EWSoftware.PDI.Properties { /// - /// This class is used to represent the E-Mail (EMAIL) property of a - /// vCard. This specifies the electronic mail address for - /// communication for the vCard object. + /// This class is used to represent the E-Mail (EMAIL) property of a vCard. This specifies the electronic + /// mail address for communication for the vCard object. /// - /// This property has no special requirements or handling. It - /// does contain an additional property to specify an e-mail type. - /// The property contains the value. - ///

With the use of property grouping, the association can be limited - /// to a group of properties. No validation is performed to ensure that - /// the e-mail address matches the specified type. + /// This property has no special requirements or handling. It does contain an additional property + /// to specify an e-mail type. The property contains the value. + /// + ///

With the use of property grouping, the association can be limited to a group of properties. No + /// validation is performed to ensure that the e-mail address matches the specified type. public class EMailProperty : BaseProperty { #region Private data members @@ -71,26 +69,18 @@ public class EMailProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object ///

/// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (EMAIL) /// - public override string Tag - { - get { return "EMAIL"; } - } + public override string Tag => "EMAIL"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the e-mail type flags diff --git a/Source/EWSPDIData/PDIProperties/EMailPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/EMailPropertyCollection.cs index 05ced01..ca093f8 100644 --- a/Source/EWSPDIData/PDIProperties/EMailPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/EMailPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : EMailPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for EMailProperty objects. It is used with the Personal Data @@ -64,8 +64,8 @@ public EMailPropertyCollection(IList emailAddresses) : base(email /// Returns the new property that was created and added to the collection public EMailProperty Add(string email) { - EMailProperty e = new EMailProperty(); - e.Value = email; + EMailProperty e = new EMailProperty { Value = email }; + base.Add(e); return e; @@ -79,9 +79,8 @@ public EMailProperty Add(string email) /// Returns the new property that was created and added to the collection public EMailProperty Add(EMailTypes emailTypes, string email) { - EMailProperty e = new EMailProperty(); - e.EMailTypes = emailTypes; - e.Value = email; + EMailProperty e = new EMailProperty { EMailTypes = emailTypes, Value = email }; + base.Add(e); return e; @@ -112,7 +111,7 @@ public void SetPreferred(EMailProperty email) int idx = base.IndexOf(email); if(idx == -1) - throw new ArgumentOutOfRangeException("email", email, LR.GetString("ExEAddrNotInCollection")); + throw new ArgumentOutOfRangeException(nameof(email), email, LR.GetString("ExEAddrNotInCollection")); this.SetPreferred(idx); } @@ -127,7 +126,7 @@ public void SetPreferred(EMailProperty email) public void SetPreferred(int idx) { if(idx < 0 || idx > base.Count) - throw new ArgumentOutOfRangeException("idx", idx, LR.GetString("ExEAddrInvalidIndex")); + throw new ArgumentOutOfRangeException(nameof(idx), idx, LR.GetString("ExEAddrInvalidIndex")); for(int nAddrIdx = 0; nAddrIdx < base.Count; nAddrIdx++) if(nAddrIdx == idx) diff --git a/Source/EWSPDIData/PDIProperties/EndDateProperty.cs b/Source/EWSPDIData/PDIProperties/EndDateProperty.cs index 783e2d3..b5e13d6 100644 --- a/Source/EWSPDIData/PDIProperties/EndDateProperty.cs +++ b/Source/EWSPDIData/PDIProperties/EndDateProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : EndDateProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the End Date property class used by the Personal Data Interchange (PDI) vCalendar and @@ -37,26 +37,19 @@ public class EndDateProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (DTEND) /// - public override string Tag - { - get { return "DTEND"; } - } + public override string Tag => "DTEND"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/ExDateProperty.cs b/Source/EWSPDIData/PDIProperties/ExDateProperty.cs index 9cb4d6b..c73c6f8 100644 --- a/Source/EWSPDIData/PDIProperties/ExDateProperty.cs +++ b/Source/EWSPDIData/PDIProperties/ExDateProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ExDateProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Exception Date property class used by the Personal Data Interchange (PDI) vCalendar @@ -37,26 +37,19 @@ public class ExDateProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (EXDATE) /// - public override string Tag - { - get { return "EXDATE"; } - } + public override string Tag => "EXDATE"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/ExDatePropertyCollection.cs b/Source/EWSPDIData/PDIProperties/ExDatePropertyCollection.cs index 7376959..b6f0ee5 100644 --- a/Source/EWSPDIData/PDIProperties/ExDatePropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/ExDatePropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ExDatePropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for ExDateProperty objects. It is used by the Personal Data @@ -64,8 +64,8 @@ public ExDatePropertyCollection(IList exDates) : base(exDates) /// Returns the new property that was created and added to the collection public ExDateProperty Add(DateTime dt) { - ExDateProperty exd = new ExDateProperty(); - exd.DateTimeValue = dt; + ExDateProperty exd = new ExDateProperty { DateTimeValue = dt }; + base.Add(exd); return exd; diff --git a/Source/EWSPDIData/PDIProperties/ExRuleProperty.cs b/Source/EWSPDIData/PDIProperties/ExRuleProperty.cs index 967857e..caf369f 100644 --- a/Source/EWSPDIData/PDIProperties/ExRuleProperty.cs +++ b/Source/EWSPDIData/PDIProperties/ExRuleProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ExRuleProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Exception Rule property. It is used with the Personal Data Interchange (PDI) @@ -35,10 +35,8 @@ public class ExRuleProperty : RRuleProperty /// /// This read-only property defines the tag (EXRULE) /// - public override string Tag - { - get { return "EXRULE"; } - } + public override string Tag => "EXRULE"; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/FormattedNameProperty.cs b/Source/EWSPDIData/PDIProperties/FormattedNameProperty.cs index f623240..f0e8944 100644 --- a/Source/EWSPDIData/PDIProperties/FormattedNameProperty.cs +++ b/Source/EWSPDIData/PDIProperties/FormattedNameProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : FormattedNameProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Formatted Name property class used by the Personal Data Interchange (PDI) vCard class @@ -36,26 +36,18 @@ public class FormattedNameProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (FN) /// - public override string Tag - { - get { return "FN"; } - } + public override string Tag => "FN"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This is a required property as defined by the 3.0 specification @@ -75,10 +67,7 @@ public override string Value return nameValue; } - set - { - base.Value = value ?? throw new ArgumentNullException(nameof(value), LR.GetString("ExFNCannotBeNull")); - } + set => base.Value = value ?? throw new ArgumentNullException(nameof(value), LR.GetString("ExFNCannotBeNull")); } /// @@ -99,10 +88,7 @@ public override string EncodedValue return nameValue; } - set - { - base.EncodedValue = value ?? throw new ArgumentNullException(nameof(value), LR.GetString("ExFNCannotBeNull")); - } + set => base.EncodedValue = value ?? throw new ArgumentNullException(nameof(value), LR.GetString("ExFNCannotBeNull")); } #endregion diff --git a/Source/EWSPDIData/PDIProperties/FreeBusyProperty.cs b/Source/EWSPDIData/PDIProperties/FreeBusyProperty.cs index 6d56023..9f89ca5 100644 --- a/Source/EWSPDIData/PDIProperties/FreeBusyProperty.cs +++ b/Source/EWSPDIData/PDIProperties/FreeBusyProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : FreeBusyProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class for the FREEBUSY property used by the Personal Data Interchange (PDI) VFreeBusy @@ -43,6 +43,7 @@ public class FreeBusyProperty : BaseProperty private Period period; private FreeBusyType freeBusyType; private string otherType; + #endregion #region Properties @@ -52,26 +53,17 @@ public class FreeBusyProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (FREEBUSY) /// - public override string Tag - { - get { return "FREEBUSY"; } - } + public override string Tag => "FREEBUSY"; /// /// This read-only property defines the default value type as PERIOD /// - public override string DefaultValueLocation - { - get { return ValLocValue.Period; } - } + public override string DefaultValueLocation => ValLocValue.Period; /// /// This property is used to set or get the free/busy type (FBTYPE) parameter @@ -80,7 +72,7 @@ public override string DefaultValueLocation /// if not already set to something else. It is set to null if set to any other free/busy type. public FreeBusyType FreeBusyType { - get { return freeBusyType; } + get => freeBusyType; set { freeBusyType = value; @@ -100,7 +92,7 @@ public FreeBusyType FreeBusyType /// Other. public string OtherType { - get { return otherType; } + get => otherType; set { freeBusyType = FreeBusyType.Other; @@ -124,10 +116,7 @@ public Period PeriodValue return period; } - set - { - period = value; - } + set => period = value; } /// @@ -158,8 +147,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/FreeBusyPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/FreeBusyPropertyCollection.cs index c9355a9..f6e7660 100644 --- a/Source/EWSPDIData/PDIProperties/FreeBusyPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/FreeBusyPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : FreeBusyPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for FreeBusyProperty objects. It is used by the Personal Data @@ -65,9 +65,8 @@ public FreeBusyPropertyCollection(IList freeBusys) : base(free /// Returns the new property that was created and added to the collection public FreeBusyProperty Add(FreeBusyType type, Period p) { - FreeBusyProperty fb = new FreeBusyProperty(); - fb.FreeBusyType = type; - fb.PeriodValue = p; + FreeBusyProperty fb = new FreeBusyProperty { FreeBusyType = type, PeriodValue = p }; + base.Add(fb); return fb; diff --git a/Source/EWSPDIData/PDIProperties/GeographicPositionProperty.cs b/Source/EWSPDIData/PDIProperties/GeographicPositionProperty.cs index b4d0a0d..5e75dff 100644 --- a/Source/EWSPDIData/PDIProperties/GeographicPositionProperty.cs +++ b/Source/EWSPDIData/PDIProperties/GeographicPositionProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : GeographicPositionProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains Geographic Position property class used by the Personal Data Interchange (PDI) classes @@ -42,26 +42,17 @@ public class GeographicPositionProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports all specifications except IrMC 1.1 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.Any; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.Any; /// /// This read-only property defines the tag (GEO) /// - public override string Tag - { - get { return "GEO"; } - } + public override string Tag => "GEO"; /// /// This read-only property defines the default value type as FLOAT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Float; } - } + public override string DefaultValueLocation => ValLocValue.Float; /// /// This is used to get or set the latitude as a floating point value @@ -116,8 +107,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/LabelProperty.cs b/Source/EWSPDIData/PDIProperties/LabelProperty.cs index c328b64..d2ab115 100644 --- a/Source/EWSPDIData/PDIProperties/LabelProperty.cs +++ b/Source/EWSPDIData/PDIProperties/LabelProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : LabelProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Label property. It is used with the Personal Data Interchange (PDI) vCard class @@ -61,26 +61,18 @@ public class LabelProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (LABEL) /// - public override string Tag - { - get { return "LABEL"; } - } + public override string Tag => "LABEL"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This is overridden to enforce the correct encoding type when the version changes @@ -88,7 +80,7 @@ public override string DefaultValueLocation /// vCard 2.1 defaults to Quoted-Printable. vCard 3.0 uses 8-bit encoding. public override SpecificationVersions Version { - get { return base.Version; } + get => base.Version; set { base.Version = value; diff --git a/Source/EWSPDIData/PDIProperties/LabelPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/LabelPropertyCollection.cs index 1d8629c..d7168e0 100644 --- a/Source/EWSPDIData/PDIProperties/LabelPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/LabelPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : LabelPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for LabelProperty objects. It is used with the Personal Data @@ -65,8 +65,8 @@ public LabelPropertyCollection(IList labels) : base(labels) /// There are two overloads for this method public LabelProperty Add(string label) { - LabelProperty l = new LabelProperty(); - l.Value = label; + LabelProperty l = new LabelProperty { Value = label }; + base.Add(l); return l; @@ -80,9 +80,8 @@ public LabelProperty Add(string label) /// Returns the new property that was created and added to the collection public LabelProperty Add(AddressTypes addressTypes, string label) { - LabelProperty l = new LabelProperty(); - l.AddressTypes = addressTypes; - l.Value = label; + LabelProperty l = new LabelProperty { AddressTypes = addressTypes, Value = label }; + base.Add(l); return l; @@ -113,7 +112,7 @@ public void SetPreferred(LabelProperty label) int idx = base.IndexOf(label); if(idx == -1) - throw new ArgumentOutOfRangeException("label", label, LR.GetString("ExLabelNotInCollection")); + throw new ArgumentOutOfRangeException(nameof(label), label, LR.GetString("ExLabelNotInCollection")); this.SetPreferred(idx); } @@ -127,7 +126,7 @@ public void SetPreferred(LabelProperty label) public void SetPreferred(int idx) { if(idx < 0 || idx > base.Count) - throw new ArgumentOutOfRangeException("idx", idx, LR.GetString("ExLabelInvalidIndex")); + throw new ArgumentOutOfRangeException(nameof(idx), idx, LR.GetString("ExLabelInvalidIndex")); for(int lblIdx = 0; lblIdx < base.Count; lblIdx++) if(lblIdx == idx) diff --git a/Source/EWSPDIData/PDIProperties/LastModifiedProperty.cs b/Source/EWSPDIData/PDIProperties/LastModifiedProperty.cs index 9ec2772..1e14f86 100644 --- a/Source/EWSPDIData/PDIProperties/LastModifiedProperty.cs +++ b/Source/EWSPDIData/PDIProperties/LastModifiedProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : LastModifiedProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Last Modified property class used by the Personal Data Interchange (PDI) vCalendar and @@ -42,30 +42,18 @@ public class LastModifiedProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0, iCalendar 2.0, and IrMC 1.1 - public override SpecificationVersions VersionsSupported - { - get - { - return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20 | - SpecificationVersions.IrMC11; - } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20 | SpecificationVersions.IrMC11; /// /// This read-only property defines the tag (LAST-MODIFIED) /// - public override string Tag - { - get { return "LAST-MODIFIED"; } - } + public override string Tag => "LAST-MODIFIED"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; /// /// This property does not allow a time zone and is always a UTC date/time value @@ -82,7 +70,7 @@ public override string Value return dtDate.ToUniversalTime().ToString(ISO8601Format.BasicDateTimeUniversal, CultureInfo.InvariantCulture); } - set { base.Value = value; } + set => base.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/LastRevisionProperty.cs b/Source/EWSPDIData/PDIProperties/LastRevisionProperty.cs index a950081..1dd31ab 100644 --- a/Source/EWSPDIData/PDIProperties/LastRevisionProperty.cs +++ b/Source/EWSPDIData/PDIProperties/LastRevisionProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : LastRevisionProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Last Revision property class used by the Personal Data Interchange (PDI) vCard class @@ -36,26 +36,19 @@ public class LastRevisionProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (REV) /// - public override string Tag - { - get { return "REV"; } - } + public override string Tag => "REV"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/LocationProperty.cs b/Source/EWSPDIData/PDIProperties/LocationProperty.cs index d857de2..9642b2e 100644 --- a/Source/EWSPDIData/PDIProperties/LocationProperty.cs +++ b/Source/EWSPDIData/PDIProperties/LocationProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : LocationProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contain the Location property class used by the Personal Data Interchange (PDI) vCalendar and @@ -36,26 +36,19 @@ public class LocationProperty : BaseAltRepProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (LOCATION) /// - public override string Tag - { - get { return "LOCATION"; } - } + public override string Tag => "LOCATION"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/LogoProperty.cs b/Source/EWSPDIData/PDIProperties/LogoProperty.cs index 5da8f54..cff67f1 100644 --- a/Source/EWSPDIData/PDIProperties/LogoProperty.cs +++ b/Source/EWSPDIData/PDIProperties/LogoProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : LogoProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Logo property that support binary encoded images. It is used with the Personal Data @@ -35,18 +35,14 @@ public class LogoProperty : PhotoProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (LOGO) /// - public override string Tag - { - get { return "LOGO"; } - } + public override string Tag => "LOGO"; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/MailerProperty.cs b/Source/EWSPDIData/PDIProperties/MailerProperty.cs index fc45589..2fc571e 100644 --- a/Source/EWSPDIData/PDIProperties/MailerProperty.cs +++ b/Source/EWSPDIData/PDIProperties/MailerProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : MailerProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains Mailer property class used by the Personal Data Interchange (PDI) vCard class @@ -38,26 +38,19 @@ public class MailerProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (MAILER) /// - public override string Tag - { - get { return "MAILER"; } - } + public override string Tag => "MAILER"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/MethodProperty.cs b/Source/EWSPDIData/PDIProperties/MethodProperty.cs index 23d7e41..092b0df 100644 --- a/Source/EWSPDIData/PDIProperties/MethodProperty.cs +++ b/Source/EWSPDIData/PDIProperties/MethodProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : MethodProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Method property used by the Personal Data Interchange (PDI) iCalendar classes @@ -37,6 +37,7 @@ public class MethodProperty : BaseProperty private CalendarMethod calendarMethod; private string otherMethod; + #endregion #region Properties @@ -46,26 +47,17 @@ public class MethodProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (METHOD) /// - public override string Tag - { - get { return "METHOD"; } - } + public override string Tag => "METHOD"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the calendar method value @@ -74,7 +66,7 @@ public override string DefaultValueLocation /// if not already set to something else. It is set to null if set to any other calendar method. public CalendarMethod CalendarMethod { - get { return calendarMethod; } + get => calendarMethod; set { calendarMethod = value; @@ -83,7 +75,7 @@ public CalendarMethod CalendarMethod otherMethod = null; else if(String.IsNullOrWhiteSpace(otherMethod)) - otherMethod = "X-UNKNOWN"; + otherMethod = "X-UNKNOWN"; } } @@ -94,7 +86,7 @@ public CalendarMethod CalendarMethod /// Other. public string OtherMethod { - get { return otherMethod; } + get => otherMethod; set { calendarMethod = CalendarMethod.Other; @@ -192,8 +184,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/MimeNameProperty.cs b/Source/EWSPDIData/PDIProperties/MimeNameProperty.cs index 8cffa64..789ad70 100644 --- a/Source/EWSPDIData/PDIProperties/MimeNameProperty.cs +++ b/Source/EWSPDIData/PDIProperties/MimeNameProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : MimeNameProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains Mime Name property class used by the Personal Data Interchange (PDI) vCard class @@ -39,26 +39,18 @@ public class MimeNameProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 3.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard30; /// /// This read-only property defines the tag (NAME) /// - public override string Tag - { - get { return "NAME"; } - } + public override string Tag => "NAME"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/MimeSourceProperty.cs b/Source/EWSPDIData/PDIProperties/MimeSourceProperty.cs index 6e37a95..476147d 100644 --- a/Source/EWSPDIData/PDIProperties/MimeSourceProperty.cs +++ b/Source/EWSPDIData/PDIProperties/MimeSourceProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : MimeSourceProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains Mime Source property class used by the Personal Data Interchange (PDI) vCard class @@ -40,26 +40,17 @@ public class MimeSourceProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 3.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard30; /// /// This read-only property defines the tag (SOURCE) /// - public override string Tag - { - get { return "SOURCE"; } - } + public override string Tag => "SOURCE"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get a string containing the context of the property value such as a diff --git a/Source/EWSPDIData/PDIProperties/NameProperty.cs b/Source/EWSPDIData/PDIProperties/NameProperty.cs index aef469a..2bae612 100644 --- a/Source/EWSPDIData/PDIProperties/NameProperty.cs +++ b/Source/EWSPDIData/PDIProperties/NameProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : NameProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Name property class used by the Personal Data Interchange (PDI) vCard class @@ -44,26 +44,18 @@ public class NameProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (N) /// - public override string Tag - { - get { return "N"; } - } + public override string Tag => "N"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the family name (last name) @@ -238,7 +230,7 @@ public override string Value string[] parts; if(value == null) - throw new ArgumentNullException("value", LR.GetString("ExNCannotBeNull")); + throw new ArgumentNullException(nameof(value), LR.GetString("ExNCannotBeNull")); this.FamilyName = this.GivenName = this.AdditionalNames = this.NamePrefix = this.NameSuffix = null; @@ -288,7 +280,7 @@ public override string EncodedValue set { if(value == null) - throw new ArgumentNullException("value", LR.GetString("ExNCannotBeNull")); + throw new ArgumentNullException(nameof(value), LR.GetString("ExNCannotBeNull")); this.Value = base.Decode(value); } diff --git a/Source/EWSPDIData/PDIProperties/NicknameProperty.cs b/Source/EWSPDIData/PDIProperties/NicknameProperty.cs index 3d8fc80..5e409cd 100644 --- a/Source/EWSPDIData/PDIProperties/NicknameProperty.cs +++ b/Source/EWSPDIData/PDIProperties/NicknameProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : NicknameProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Nickname property class used by the Personal Data Interchange (PDI) vCard class @@ -48,35 +48,23 @@ public class NicknameProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 3.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard30; /// /// This read-only property defines the tag (NICKNAME) /// - public override string Tag - { - get { return "NICKNAME"; } - } + public override string Tag => "NICKNAME"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to get the nicknames string collection /// /// Nicknames can be added to or removed from the returned collection reference - public StringCollection Nicknames - { - get { return nicknames; } - } + public StringCollection Nicknames => nicknames; /// /// This property is used to get or set the nicknames as a string value @@ -85,7 +73,7 @@ public StringCollection Nicknames /// will be split and loaded into the nicknames string collection. public string NicknamesString { - get { return String.Join(", ", nicknames); } + get => String.Join(", ", nicknames); set { string tempName; @@ -161,8 +149,8 @@ public override string Value /// The nicknames are escaped as needed public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/NoteProperty.cs b/Source/EWSPDIData/PDIProperties/NoteProperty.cs index 6731085..47870f1 100644 --- a/Source/EWSPDIData/PDIProperties/NoteProperty.cs +++ b/Source/EWSPDIData/PDIProperties/NoteProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : NoteProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Note property and its collection class. It is used with the Personal Data Interchange @@ -37,26 +37,18 @@ public class NoteProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (NOTE) /// - public override string Tag - { - get { return "NOTE"; } - } + public override string Tag => "NOTE"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This is overridden to enforce the correct encoding type when the version changes @@ -64,7 +56,7 @@ public override string DefaultValueLocation /// vCard 2.1 defaults to Quoted-Printable. vCard 3.0 uses 8-bit encoding. public override SpecificationVersions Version { - get { return base.Version; } + get => base.Version; set { base.Version = value; diff --git a/Source/EWSPDIData/PDIProperties/NotePropertyCollection.cs b/Source/EWSPDIData/PDIProperties/NotePropertyCollection.cs index b6b47a8..9ef902d 100644 --- a/Source/EWSPDIData/PDIProperties/NotePropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/NotePropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : NotePropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for LabelProperty objects. It is used with the Personal Data @@ -63,8 +63,8 @@ public NotePropertyCollection(IList notes) : base(notes) /// Returns the new property that was created and added to the collection public NoteProperty Add(string note) { - NoteProperty n = new NoteProperty(); - n.Value = note; + NoteProperty n = new NoteProperty { Value = note }; + base.Add(n); return n; diff --git a/Source/EWSPDIData/PDIProperties/OrganizationProperty.cs b/Source/EWSPDIData/PDIProperties/OrganizationProperty.cs index 8c78fb1..f3700c0 100644 --- a/Source/EWSPDIData/PDIProperties/OrganizationProperty.cs +++ b/Source/EWSPDIData/PDIProperties/OrganizationProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : OrganizationProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Organization property class used by the Personal Data Interchange (PDI) vCard class @@ -38,6 +38,7 @@ public class OrganizationProperty : BaseProperty private static Regex reSplit = new Regex(@"(?:^[;])|(?<=(?:[^\\]))[;]"); private StringCollection units; + #endregion #region Properties @@ -47,26 +48,18 @@ public class OrganizationProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (ORG) /// - public override string Tag - { - get { return "ORG"; } - } + public override string Tag => "ORG"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the organization name @@ -77,10 +70,7 @@ public override string DefaultValueLocation /// This property is used to get the Organization Units string collection /// /// Units can be added to or removed from the returned collection reference - public StringCollection Units - { - get { return units; } - } + public StringCollection Units => units; /// /// This property is used to set or get the Organization Units as a string value @@ -89,7 +79,7 @@ public StringCollection Units /// will be split and loaded into the units string collection. public string UnitsString { - get { return String.Join(", ", units); } + get => String.Join(", ", units); set { string tempUnit; @@ -99,7 +89,7 @@ public string UnitsString if(value != null) { - entries = value.Split(new[] { ',', ';'}, StringSplitOptions.RemoveEmptyEntries); + entries = value.Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries); foreach(string s in entries) { @@ -189,10 +179,7 @@ public override string EncodedValue return orgValue; } - set - { - this.Value = (value == null) ? value : base.Decode(value); - } + set => this.Value = (value == null) ? value : base.Decode(value); } #endregion diff --git a/Source/EWSPDIData/PDIProperties/OrganizerProperty.cs b/Source/EWSPDIData/PDIProperties/OrganizerProperty.cs index 5751aa5..04fa689 100644 --- a/Source/EWSPDIData/PDIProperties/OrganizerProperty.cs +++ b/Source/EWSPDIData/PDIProperties/OrganizerProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : OrganizerProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Organizer property. This property only applies to iCalendar 2.0 @@ -41,26 +41,17 @@ public class OrganizerProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (ORGANIZER) /// - public override string Tag - { - get { return "ORGANIZER"; } - } + public override string Tag => "ORGANIZER"; /// /// This read-only property defines the default value type as CAL-ADDRESS (calendar address) /// - public override string DefaultValueLocation - { - get { return ValLocValue.CalAddress; } - } + public override string DefaultValueLocation => ValLocValue.CalAddress; /// /// This property is used to set or get the common name (CN) parameter associated with the calendar user diff --git a/Source/EWSPDIData/PDIProperties/PercentCompleteProperty.cs b/Source/EWSPDIData/PDIProperties/PercentCompleteProperty.cs index 65c90ed..e7dd8e0 100644 --- a/Source/EWSPDIData/PDIProperties/PercentCompleteProperty.cs +++ b/Source/EWSPDIData/PDIProperties/PercentCompleteProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PercentCompleteProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Percent Complete property class used by the Personal Data Interchange (PDI) vCalendar @@ -50,26 +50,17 @@ public class PercentCompleteProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (PERCENT-COMPLETE) /// - public override string Tag - { - get { return "PERCENT-COMPLETE"; } - } + public override string Tag => "PERCENT-COMPLETE"; /// /// This read-only property defines the default value type as INTEGER /// - public override string DefaultValueLocation - { - get { return ValLocValue.Integer; } - } + public override string DefaultValueLocation => ValLocValue.Integer; /// /// This allows the percentage to be set or retrieved as an integer @@ -78,11 +69,11 @@ public override string DefaultValueLocation /// and 100. public int Percentage { - get { return percentage; } + get => percentage; set { if(value < 0 || value > 100) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExPercentageBadValue")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExPercentageBadValue")); percentage = value; } @@ -122,8 +113,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/PhotoProperty.cs b/Source/EWSPDIData/PDIProperties/PhotoProperty.cs index f4e075a..0c935d5 100644 --- a/Source/EWSPDIData/PDIProperties/PhotoProperty.cs +++ b/Source/EWSPDIData/PDIProperties/PhotoProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PhotoProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Photo property that support binary encoded images. It is used with the Personal Data @@ -68,26 +68,18 @@ public class PhotoProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (PHOTO) /// - public override string Tag - { - get { return "PHOTO"; } - } + public override string Tag => "PHOTO"; /// /// This read-only property defines the default value type as BINARY /// - public override string DefaultValueLocation - { - get { return ValLocValue.Binary; } - } + public override string DefaultValueLocation => ValLocValue.Binary; /// /// This is used to set or get the image type diff --git a/Source/EWSPDIData/PDIProperties/PriorityProperty.cs b/Source/EWSPDIData/PDIProperties/PriorityProperty.cs index a191db5..7757ce5 100644 --- a/Source/EWSPDIData/PDIProperties/PriorityProperty.cs +++ b/Source/EWSPDIData/PDIProperties/PriorityProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PriorityProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Priority property class used by the Personal Data Interchange (PDI) vCalendar and @@ -46,26 +46,18 @@ public class PriorityProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (PRIORITY) /// - public override string Tag - { - get { return "PRIORITY"; } - } + public override string Tag => "PRIORITY"; /// /// This read-only property defines the default value type as INTEGER /// - public override string DefaultValueLocation - { - get { return ValLocValue.Integer; } - } + public override string DefaultValueLocation => ValLocValue.Integer; /// /// This allows the priority to be set or retrieved as an integer @@ -74,11 +66,11 @@ public override string DefaultValueLocation /// and 9. public int PriorityValue { - get { return priorityValue; } + get => priorityValue; set { if(value < 0 || value > 9) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExPriorityBadValue")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExPriorityBadValue")); priorityValue = value; } @@ -113,8 +105,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/ProductIdProperty.cs b/Source/EWSPDIData/PDIProperties/ProductIdProperty.cs index 4d0b8ce..87c6076 100644 --- a/Source/EWSPDIData/PDIProperties/ProductIdProperty.cs +++ b/Source/EWSPDIData/PDIProperties/ProductIdProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ProductIdProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Product ID property class used by the Personal Data Interchange (PDI) classes such as @@ -48,30 +48,18 @@ public class ProductIdProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 3.0, vCalendar 1.0, and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get - { - return SpecificationVersions.vCard30 | SpecificationVersions.vCalendar10 | - SpecificationVersions.iCalendar20; - } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard30 | + SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (PRODID) /// - public override string Tag - { - get { return "PRODID"; } - } + public override string Tag => "PRODID"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This is used to set or get whether the product ID is registered @@ -155,8 +143,8 @@ public override string Value /// If some but not all parts are specified, default values are used for the missing parts public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/PublicKeyProperty.cs b/Source/EWSPDIData/PDIProperties/PublicKeyProperty.cs index bd1ef2d..59ead6c 100644 --- a/Source/EWSPDIData/PDIProperties/PublicKeyProperty.cs +++ b/Source/EWSPDIData/PDIProperties/PublicKeyProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : PublicKeyProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Public Key property that support binary encoded public key values. It is used with @@ -53,26 +53,18 @@ public class PublicKeyProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the default value type as BINARY /// - public override string DefaultValueLocation - { - get { return ValLocValue.Binary; } - } + public override string DefaultValueLocation => ValLocValue.Binary; /// /// This read-only property defines the tag (KEY) /// - public override string Tag - { - get { return "KEY"; } - } + public override string Tag => "KEY"; /// /// This is used to set or get the public key type diff --git a/Source/EWSPDIData/PDIProperties/RDateProperty.cs b/Source/EWSPDIData/PDIProperties/RDateProperty.cs index db9ba7a..79cda3e 100644 --- a/Source/EWSPDIData/PDIProperties/RDateProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RDateProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RDateProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a class for the RDATE property used by the Personal Data Interchange (PDI) classes such as @@ -42,7 +42,7 @@ public class RDateProperty : BaseProperty private Period period; private string timeZoneId; - private bool isFloating; + #endregion #region Properties @@ -52,26 +52,18 @@ public class RDateProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (RDATE) /// - public override string Tag - { - get { return "RDATE"; } - } + public override string Tag => "RDATE"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; /// /// This is used to set or get whether the date/time is floating @@ -87,11 +79,7 @@ public override string DefaultValueLocation /// /// This only applies when the value is a date/time, not a period. /// - public bool IsFloating - { - get { return isFloating; } - set { isFloating = value; } - } + public bool IsFloating { get; set; } /// /// This is used to get or set the time zone ID (TZID) parameter value @@ -102,7 +90,7 @@ public bool IsFloating /// the owning calendar. If set, the property is ignored. public string TimeZoneId { - get { return timeZoneId; } + get => timeZoneId; set { if(!String.IsNullOrWhiteSpace(value)) @@ -122,7 +110,7 @@ public string TimeZoneId /// public virtual DateTime TimeZoneDateTime { - get { return this.PeriodValue.StartDateTime; } + get => this.PeriodValue.StartDateTime; set { if(this.ValueLocation == ValLocValue.Period) @@ -272,7 +260,7 @@ public override string Value else { // iCalendar with time zone parameter uses local time format. So does a floating date/time. - if(isFloating || (this.Version == SpecificationVersions.iCalendar20 && timeZoneId != null)) + if(this.IsFloating || (this.Version == SpecificationVersions.iCalendar20 && timeZoneId != null)) format = ISO8601Format.BasicDateTimeLocal; else { @@ -285,7 +273,7 @@ public override string Value } set { - isFloating = false; + this.IsFloating = false; if(value != null && value.Length > 0) { @@ -296,7 +284,7 @@ public override string Value DateTime dt = DateUtils.FromISO8601String(value, true); if(this.ValueLocation == ValLocValue.DateTime && timeZoneId == null) - isFloating = DateUtils.IsFloatingFormat(value); + this.IsFloating = DateUtils.IsFloatingFormat(value); // We store it as a period internally to keep things simple. No need to keep a separate // date object in synch with the period start if the format changes. @@ -313,8 +301,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/RDatePropertyCollection.cs b/Source/EWSPDIData/PDIProperties/RDatePropertyCollection.cs index ff26b46..4c85a5d 100644 --- a/Source/EWSPDIData/PDIProperties/RDatePropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/RDatePropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RDatePropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for RDateProperty objects. It is used with the Personal Data @@ -65,8 +65,8 @@ public RDatePropertyCollection(IList recurDates) : base(recurDate /// There are two overloads for this method public RDateProperty Add(DateTime dt) { - RDateProperty rdt = new RDateProperty(); - rdt.DateTimeValue = dt; + RDateProperty rdt = new RDateProperty { DateTimeValue = dt }; + base.Add(rdt); return rdt; @@ -79,8 +79,8 @@ public RDateProperty Add(DateTime dt) /// Returns the new property that was created and added to the collection public RDateProperty Add(Period p) { - RDateProperty rdt = new RDateProperty(); - rdt.PeriodValue = p; + RDateProperty rdt = new RDateProperty { PeriodValue = p }; + base.Add(rdt); return rdt; diff --git a/Source/EWSPDIData/PDIProperties/RRuleProperty.cs b/Source/EWSPDIData/PDIProperties/RRuleProperty.cs index 8dee137..bc8d537 100644 --- a/Source/EWSPDIData/PDIProperties/RRuleProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RRuleProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RRuleProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Recurrence Rule property. It is used with the Personal Data Interchange (PDI) @@ -43,26 +43,18 @@ public class RRuleProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (RRULE) /// - public override string Tag - { - get { return "RRULE"; } - } + public override string Tag => "RRULE"; /// /// This read-only property defines the default value type as RECUR /// - public override string DefaultValueLocation - { - get { return ValLocValue.Recur; } - } + public override string DefaultValueLocation => ValLocValue.Recur; /// /// This is used to get the recurrence rule information @@ -95,7 +87,7 @@ public override string Value return recur.ToString(); } - set { this.Recurrence.Parse(value); } + set => this.Recurrence.Parse(value); } /// @@ -103,8 +95,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/RecurrenceCountProperty.cs b/Source/EWSPDIData/PDIProperties/RecurrenceCountProperty.cs index 6f9f838..0ef59bc 100644 --- a/Source/EWSPDIData/PDIProperties/RecurrenceCountProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RecurrenceCountProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RecurrenceCountProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Recurrence Count property class used by the Personal Data Interchange (PDI) vCalendar @@ -39,6 +39,7 @@ public class RecurrenceCountProperty : BaseProperty private static Regex reNumber = new Regex(@"^\d*$"); private int count; + #endregion #region Properties @@ -48,26 +49,17 @@ public class RecurrenceCountProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10; /// /// This read-only property defines the tag (RNUM) /// - public override string Tag - { - get { return "RNUM"; } - } + public override string Tag => "RNUM"; /// /// This read-only property defines the default value type as INTEGER /// - public override string DefaultValueLocation - { - get { return ValLocValue.Integer; } - } + public override string DefaultValueLocation => ValLocValue.Integer; /// /// This allows the recurrence count to be set or retrieved as an integer for a vCalendar object @@ -75,11 +67,11 @@ public override string DefaultValueLocation /// An exception is thrown if the value is less than zero public int Count { - get { return count; } + get => count; set { if(value < 0) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRNumBadValue")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRNumBadValue")); count = value; } @@ -119,8 +111,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/RecurrenceIdProperty.cs b/Source/EWSPDIData/PDIProperties/RecurrenceIdProperty.cs index 7321fa7..43e2d56 100644 --- a/Source/EWSPDIData/PDIProperties/RecurrenceIdProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RecurrenceIdProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RecurrenceIdProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Recurrence ID property class used by the Personal Data Interchange (PDI) iCalendar @@ -20,7 +20,6 @@ //=============================================================================================================== using System; -using System.Globalization; using System.Text; namespace EWSoftware.PDI.Properties @@ -43,6 +42,7 @@ public class RecurrenceIdProperty : BaseDateTimeProperty //===================================================================== private string range; + #endregion #region Properties @@ -52,33 +52,24 @@ public class RecurrenceIdProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (RECURRENCE-ID) /// - public override string Tag - { - get { return "RECURRENCE-ID"; } - } + public override string Tag => "RECURRENCE-ID"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; /// /// This property is used to get or set the range (RANGE) parameter /// public string Range { - get { return range; } + get => range; set { if(!String.IsNullOrWhiteSpace(value)) diff --git a/Source/EWSPDIData/PDIProperties/RelatedToProperty.cs b/Source/EWSPDIData/PDIProperties/RelatedToProperty.cs index 4ca9fe4..a36c987 100644 --- a/Source/EWSPDIData/PDIProperties/RelatedToProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RelatedToProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RelatedToProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Related To property. It is used with the vCalendar and iCalendar Personal Data @@ -20,7 +20,6 @@ //=============================================================================================================== using System; -using System.Globalization; using System.Text; namespace EWSoftware.PDI.Properties @@ -39,6 +38,7 @@ public class RelatedToProperty : BaseProperty private RelationshipType relType; private string otherType; + #endregion #region Properties @@ -48,26 +48,18 @@ public class RelatedToProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (RELATED-TO) /// - public override string Tag - { - get { return "RELATED-TO"; } - } + public override string Tag => "RELATED-TO"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the relationship type (RELTYPE) parameter @@ -77,7 +69,7 @@ public override string DefaultValueLocation /// something else. It is set to null if set to any other calendar method. public RelationshipType RelationshipType { - get { return relType; } + get => relType; set { relType = value; @@ -98,7 +90,7 @@ public RelationshipType RelationshipType /// automatically sets the property to Other. public string OtherRelationship { - get { return otherType; } + get => otherType; set { relType = RelationshipType.Other; diff --git a/Source/EWSPDIData/PDIProperties/RelatedToPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/RelatedToPropertyCollection.cs index e26745b..788cdf2 100644 --- a/Source/EWSPDIData/PDIProperties/RelatedToPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/RelatedToPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RelatedToPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for EMailProperty objects. It is used with the Personal Data @@ -64,9 +64,8 @@ public RelatedToPropertyCollection(IList relatedTos) : base(r /// Returns the new property that was created and added to the collection public RelatedToProperty Add(RelationshipType rType, string relation) { - RelatedToProperty rt = new RelatedToProperty(); - rt.RelationshipType = rType; - rt.Value = relation; + RelatedToProperty rt = new RelatedToProperty { RelationshipType = rType, Value = relation }; + base.Add(rt); return rt; diff --git a/Source/EWSPDIData/PDIProperties/RepeatProperty.cs b/Source/EWSPDIData/PDIProperties/RepeatProperty.cs index 7b8473a..5c7b06f 100644 --- a/Source/EWSPDIData/PDIProperties/RepeatProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RepeatProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RepeatProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Repeat property used by the Personal Data Interchange (PDI) vCalendar and iCalendar @@ -49,26 +49,18 @@ public class RepeatProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (REPEAT) /// - public override string Tag - { - get { return "REPEAT"; } - } + public override string Tag => "REPEAT"; /// /// This read-only property defines the default value type as INTEGER /// - public override string DefaultValueLocation - { - get { return ValLocValue.Integer; } - } + public override string DefaultValueLocation => ValLocValue.Integer; /// /// This allows the repeat count to be set or retrieved as an integer @@ -76,11 +68,11 @@ public override string DefaultValueLocation /// An exception is thrown if the value is less than zero public int RepeatCount { - get { return repeatCount; } + get => repeatCount; set { if(value < 0) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExRptCountBadValue")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExRptCountBadValue")); repeatCount = value; } @@ -120,8 +112,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/RequestStatusProperty.cs b/Source/EWSPDIData/PDIProperties/RequestStatusProperty.cs index db83895..e128de4 100644 --- a/Source/EWSPDIData/PDIProperties/RequestStatusProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RequestStatusProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RequestStatusProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Request Status property. It is used with the iCalendar Personal Data Interchange @@ -37,26 +37,17 @@ public class RequestStatusProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (REQUEST-STATUS) /// - public override string Tag - { - get { return "REQUEST-STATUS"; } - } + public override string Tag => "REQUEST-STATUS"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This is used to get or set the status code value @@ -121,8 +112,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/RequestStatusPropertyCollection.cs b/Source/EWSPDIData/PDIProperties/RequestStatusPropertyCollection.cs index 0aa57a1..a780271 100644 --- a/Source/EWSPDIData/PDIProperties/RequestStatusPropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/RequestStatusPropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RequestStatusPropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 11/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for RequestStatusProperty objects. It is used by the Personal Data @@ -66,10 +66,13 @@ public RequestStatusPropertyCollection(IList stats) : bas /// Returns the new property that was created and added to the collection public RequestStatusProperty Add(string code, string message, string data) { - RequestStatusProperty rs = new RequestStatusProperty(); - rs.StatusCode = code; - rs.StatusMessage = message; - rs.ExtendedData = data; + RequestStatusProperty rs = new RequestStatusProperty + { + StatusCode = code, + StatusMessage = message, + ExtendedData = data + }; + base.Add(rs); return rs; diff --git a/Source/EWSPDIData/PDIProperties/ResourcesProperty.cs b/Source/EWSPDIData/PDIProperties/ResourcesProperty.cs index b7d2b52..791acf4 100644 --- a/Source/EWSPDIData/PDIProperties/ResourcesProperty.cs +++ b/Source/EWSPDIData/PDIProperties/ResourcesProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : ResourcesProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Resources property class used by the Personal Data Interchange (PDI) classes such as @@ -49,35 +49,24 @@ public class ResourcesProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (RESOURCES) /// - public override string Tag - { - get { return "RESOURCES"; } - } + public override string Tag => "RESOURCES"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to get the resources string collection /// /// Resources can be added to or removed from the returned collection reference - public StringCollection Resources - { - get { return resources; } - } + public StringCollection Resources => resources; /// /// This property is used to set or get the resource as a string value @@ -86,7 +75,7 @@ public StringCollection Resources /// will be split and loaded into the resources string collection. public string ResourcesString { - get { return String.Join(", ", resources); } + get => String.Join(", ", resources); set { string tempRes; @@ -167,8 +156,8 @@ public override string Value /// The resources are escaped as needed public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/RoleProperty.cs b/Source/EWSPDIData/PDIProperties/RoleProperty.cs index 058e184..2b7e695 100644 --- a/Source/EWSPDIData/PDIProperties/RoleProperty.cs +++ b/Source/EWSPDIData/PDIProperties/RoleProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : RoleProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Role property class used by the Personal Data Interchange (PDI) vCard class @@ -35,26 +35,19 @@ public class RoleProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (ROLE) /// - public override string Tag - { - get { return "ROLE"; } - } + public override string Tag => "ROLE"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/SequenceProperty.cs b/Source/EWSPDIData/PDIProperties/SequenceProperty.cs index 8703a06..10c5e77 100644 --- a/Source/EWSPDIData/PDIProperties/SequenceProperty.cs +++ b/Source/EWSPDIData/PDIProperties/SequenceProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : SequenceProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Sequence property class used by the Personal Data Interchange (PDI) vCalendar and @@ -49,26 +49,18 @@ public class SequenceProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (SEQUENCE) /// - public override string Tag - { - get { return "SEQUENCE"; } - } + public override string Tag => "SEQUENCE"; /// /// This read-only property defines the default value type as INTEGER /// - public override string DefaultValueLocation - { - get { return ValLocValue.Integer; } - } + public override string DefaultValueLocation => ValLocValue.Integer; /// /// This allows the sequence number to be set or retrieved as an integer @@ -76,11 +68,11 @@ public override string DefaultValueLocation /// An exception is thrown if the value is less than zero public int SequenceNumber { - get { return sequenceNumber; } + get => sequenceNumber; set { if(value < 0) - throw new ArgumentOutOfRangeException("value", value, LR.GetString("ExSeqNumbBadValue")); + throw new ArgumentOutOfRangeException(nameof(value), value, LR.GetString("ExSeqNumbBadValue")); sequenceNumber = value; } @@ -120,8 +112,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/SortStringProperty.cs b/Source/EWSPDIData/PDIProperties/SortStringProperty.cs index 8f9175b..ac361eb 100644 --- a/Source/EWSPDIData/PDIProperties/SortStringProperty.cs +++ b/Source/EWSPDIData/PDIProperties/SortStringProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : SortStringProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Sort String property class used by the Personal Data Interchange (PDI) vCard class @@ -37,26 +37,18 @@ public class SortStringProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 3.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard30; /// /// This read-only property defines the tag (SORT-STRING) /// - public override string Tag - { - get { return "SORT-STRING"; } - } + public override string Tag => "SORT-STRING"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/SoundProperty.cs b/Source/EWSPDIData/PDIProperties/SoundProperty.cs index 75c91c1..97fefaf 100644 --- a/Source/EWSPDIData/PDIProperties/SoundProperty.cs +++ b/Source/EWSPDIData/PDIProperties/SoundProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : SoundProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Sound property that support binary encoded sounds. It is used with the Personal Data @@ -38,8 +38,6 @@ public class SoundProperty : BaseProperty #region Private data members //===================================================================== - private string soundType; - // This private array is used to translate parameter names and values to sound types private static NameToValue[] ntv = { new NameToValue("TYPE", 0, false), @@ -57,37 +55,26 @@ public class SoundProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (SOUND) /// - public override string Tag - { - get { return "SOUND"; } - } + public override string Tag => "SOUND"; /// /// This read-only property defines the default value type as BINARY /// - public override string DefaultValueLocation - { - get { return ValLocValue.Binary; } - } + public override string DefaultValueLocation => ValLocValue.Binary; /// /// This is used to set or get the sound type /// /// The value is a string defining the type of sound that the property value represents such as /// basic, WAV, etc. - public string SoundType - { - get { return soundType; } - set { soundType = value; } - } + public string SoundType { get; set; } + #endregion #region Constructor @@ -123,7 +110,7 @@ public override object Clone() /// The PDI object from which the settings are to be copied protected override void Clone(PDIObject p) { - soundType = ((SoundProperty)p).SoundType; + this.SoundType = ((SoundProperty)p).SoundType; base.Clone(p); } diff --git a/Source/EWSPDIData/PDIProperties/StartDateProperty.cs b/Source/EWSPDIData/PDIProperties/StartDateProperty.cs index 2fb0d36..7836b7b 100644 --- a/Source/EWSPDIData/PDIProperties/StartDateProperty.cs +++ b/Source/EWSPDIData/PDIProperties/StartDateProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : StartDateProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Start Date property class used by the Personal Data Interchange (PDI) vCalendar and @@ -37,26 +37,19 @@ public class StartDateProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (DTSTART) /// - public override string Tag - { - get { return "DTSTART"; } - } + public override string Tag => "DTSTART"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/StatusProperty.cs b/Source/EWSPDIData/PDIProperties/StatusProperty.cs index a15b27b..d3c10f8 100644 --- a/Source/EWSPDIData/PDIProperties/StatusProperty.cs +++ b/Source/EWSPDIData/PDIProperties/StatusProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : StatusProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Status property class used by the Personal Data Interchange (PDI) vCalendar and @@ -34,8 +34,6 @@ public class StatusProperty : BaseAltRepProperty #region Private data members //===================================================================== - private StatusValue status; - // This private array is used to translate status value names to enumerated status values private static NameToValue[] ntv = { new NameToValue("ACCEPTED", StatusValue.Accepted, true), @@ -61,35 +59,23 @@ public class StatusProperty : BaseAltRepProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (STATUS) /// - public override string Tag - { - get { return "STATUS"; } - } + public override string Tag => "STATUS"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the status value /// - public StatusValue StatusValue - { - get { return status; } - set { status = value; } - } + public StatusValue StatusValue { get; set; } /// /// This property is overridden to handle converting the text value to an enumerated status value @@ -99,24 +85,24 @@ public override string Value get { // If it's the default, return nothing - if(status == StatusValue.None) + if(this.StatusValue == StatusValue.None) return null; for(int idx = 0; idx < ntv.Length; idx++) - if(status == ntv[idx].EnumValue) + if(this.StatusValue == ntv[idx].EnumValue) return ntv[idx].Name; return null; } set { - status = StatusValue.None; + this.StatusValue = StatusValue.None; if(value != null && value.Length != 0) for(int idx = 0; idx < ntv.Length; idx++) if(ntv[idx].IsMatch(value)) { - status = ntv[idx].EnumValue; + this.StatusValue = ntv[idx].EnumValue; break; } } @@ -127,8 +113,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/SummaryProperty.cs b/Source/EWSPDIData/PDIProperties/SummaryProperty.cs index a5cb874..93f3e54 100644 --- a/Source/EWSPDIData/PDIProperties/SummaryProperty.cs +++ b/Source/EWSPDIData/PDIProperties/SummaryProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : SummaryProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/14/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Summary property class used by the Personal Data Interchange (PDI) vCalendar and @@ -38,30 +38,19 @@ public class SummaryProperty : BaseAltRepProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0, iCalendar 2.0, and IrMC 1.1 - public override SpecificationVersions VersionsSupported - { - get - { - return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20 | - SpecificationVersions.IrMC11; - } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20 | SpecificationVersions.IrMC11; /// /// This read-only property defines the tag (SUMMARY) /// - public override string Tag - { - get { return "SUMMARY"; } - } + public override string Tag => "SUMMARY"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/TelephoneProperty.cs b/Source/EWSPDIData/PDIProperties/TelephoneProperty.cs index 300e9ce..230f364 100644 --- a/Source/EWSPDIData/PDIProperties/TelephoneProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TelephoneProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TelephoneProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Telephone property class. It is used with the Personal Data Interchange (PDI) vCard @@ -45,8 +45,6 @@ public class TelephoneProperty : BaseProperty private static Regex reSplit = new Regex(@"(?:^[,])|(?<=(?:[^\\]))[,]"); - private PhoneTypes phoneTypes; - // This private array is used to translate parameter names and values to phone types private static NameToValue[] ntv = { new NameToValue("TYPE", PhoneTypes.None, false), @@ -77,35 +75,24 @@ public class TelephoneProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (TEL) /// - public override string Tag - { - get { return "TEL"; } - } + public override string Tag => "TEL"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This property is used to set or get the phone type flags /// - public PhoneTypes PhoneTypes - { - get { return phoneTypes; } - set { phoneTypes = value; } - } + public PhoneTypes PhoneTypes { get; set; } + #endregion #region Constructor @@ -118,7 +105,7 @@ public PhoneTypes PhoneTypes public TelephoneProperty() { this.Version = SpecificationVersions.vCard30; - phoneTypes = PhoneTypes.Voice; + this.PhoneTypes = PhoneTypes.Voice; } #endregion @@ -142,7 +129,7 @@ public override object Clone() /// The PDI object from which the settings are to be copied protected override void Clone(PDIObject p) { - phoneTypes = ((TelephoneProperty)p).PhoneTypes; + this.PhoneTypes = ((TelephoneProperty)p).PhoneTypes; base.Clone(p); } diff --git a/Source/EWSPDIData/PDIProperties/TelephonePropertyCollection.cs b/Source/EWSPDIData/PDIProperties/TelephonePropertyCollection.cs index caa149e..3258857 100644 --- a/Source/EWSPDIData/PDIProperties/TelephonePropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/TelephonePropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TelephonePropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for TelephoneProperty objects. It is used with the Personal Data @@ -64,8 +64,8 @@ public TelephonePropertyCollection(IList phones) : base(phone /// Returns the new property that was created and added to the collection public TelephoneProperty Add(string phone) { - TelephoneProperty t = new TelephoneProperty(); - t.Value = phone; + TelephoneProperty t = new TelephoneProperty { Value = phone }; + base.Add(t); return t; @@ -79,9 +79,8 @@ public TelephoneProperty Add(string phone) /// Returns the new property that was created and added to the collection public TelephoneProperty Add(PhoneTypes phoneTypes, string phone) { - TelephoneProperty t = new TelephoneProperty(); - t.PhoneTypes = phoneTypes; - t.Value = phone; + TelephoneProperty t = new TelephoneProperty { PhoneTypes = phoneTypes, Value = phone }; + base.Add(t); return t; @@ -112,7 +111,7 @@ public void SetPreferred(TelephoneProperty phone) int idx = base.IndexOf(phone); if(idx == -1) - throw new ArgumentOutOfRangeException("phone", phone, LR.GetString("ExPhoneNotInCollection")); + throw new ArgumentOutOfRangeException(nameof(phone), phone, LR.GetString("ExPhoneNotInCollection")); this.SetPreferred(idx); } @@ -127,7 +126,7 @@ public void SetPreferred(TelephoneProperty phone) public void SetPreferred(int idx) { if(idx < 0 || idx > base.Count) - throw new ArgumentOutOfRangeException("idx", idx, LR.GetString("ExPhoneInvalidIndex")); + throw new ArgumentOutOfRangeException(nameof(idx), idx, LR.GetString("ExPhoneInvalidIndex")); for(int phoneIdx = 0; phoneIdx < base.Count; phoneIdx++) if(phoneIdx == idx) diff --git a/Source/EWSPDIData/PDIProperties/TimeStampProperty.cs b/Source/EWSPDIData/PDIProperties/TimeStampProperty.cs index e20100d..f6ddbd1 100644 --- a/Source/EWSPDIData/PDIProperties/TimeStampProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TimeStampProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeStampProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the time stamp property class used by the Personal Data Interchange (PDI) iCalendar class @@ -45,26 +45,17 @@ public class TimeStampProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (DTSTAMP) /// - public override string Tag - { - get { return "DTSTAMP"; } - } + public override string Tag => "DTSTAMP"; /// /// This read-only property defines the default value type as DATE-TIME /// - public override string DefaultValueLocation - { - get { return ValLocValue.DateTime; } - } + public override string DefaultValueLocation => ValLocValue.DateTime; /// /// This property does not allow a time zone and is always a UTC date/time value @@ -81,7 +72,7 @@ public override string Value return dtDate.ToUniversalTime().ToString(ISO8601Format.BasicDateTimeUniversal, CultureInfo.InvariantCulture); } - set { base.Value = value; } + set => base.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/TimeTransparencyProperty.cs b/Source/EWSPDIData/PDIProperties/TimeTransparencyProperty.cs index bc077ef..9eda3e0 100644 --- a/Source/EWSPDIData/PDIProperties/TimeTransparencyProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TimeTransparencyProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeTransparencyProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Time Transparency property class used by the Personal Data Interchange (PDI) vCalendar @@ -20,7 +20,6 @@ //=============================================================================================================== using System; -using System.Globalization; namespace EWSoftware.PDI.Properties { @@ -40,26 +39,18 @@ public class TimeTransparencyProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (TRANSP) /// - public override string Tag - { - get { return "TRANSP"; } - } + public override string Tag => "TRANSP"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This is used to return the transparency state as a Boolean @@ -101,8 +92,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/TimeZoneIdProperty.cs b/Source/EWSPDIData/PDIProperties/TimeZoneIdProperty.cs index 1b7326a..cfad9d8 100644 --- a/Source/EWSPDIData/PDIProperties/TimeZoneIdProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TimeZoneIdProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeZoneIdProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Time Zone ID property classes used by the Personal Data Interchange (PDI) iCalendar @@ -42,26 +42,17 @@ public class TimeZoneIdProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (TZID) /// - public override string Tag - { - get { return "TZID"; } - } + public override string Tag => "TZID"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This is overridden to raise the event when the ID changes @@ -69,7 +60,7 @@ public override string DefaultValueLocation /// This is thrown if the value is set to null or an empty string public override string Value { - get { return base.Value; } + get => base.Value; set { if(String.IsNullOrWhiteSpace(value)) @@ -94,7 +85,7 @@ public override string Value /// This is thrown if the value is set to null public override string EncodedValue { - get { return base.EncodedValue; } + get => base.EncodedValue; set { if(String.IsNullOrWhiteSpace(value)) @@ -129,10 +120,7 @@ public override string EncodedValue /// The event arguments protected virtual void OnTimeZoneIdChanged(TimeZoneIdChangedEventArgs e) { - var handler = TimeZoneIdChanged; - - if(handler != null) - handler(this, e); + TimeZoneIdChanged?.Invoke(this, e); } #endregion diff --git a/Source/EWSPDIData/PDIProperties/TimeZoneNameProperty.cs b/Source/EWSPDIData/PDIProperties/TimeZoneNameProperty.cs index 858b39e..659ef00 100644 --- a/Source/EWSPDIData/PDIProperties/TimeZoneNameProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TimeZoneNameProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeZoneNameProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Time Zone Name property classes used by the Personal Data Interchange (PDI) iCalendar @@ -47,26 +47,17 @@ public class TimeZoneNameProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (TZNAME) /// - public override string Tag - { - get { return "TZNAME"; } - } + public override string Tag => "TZNAME"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This read-only property is used to get the time zone name in its abbreviated form diff --git a/Source/EWSPDIData/PDIProperties/TimeZoneNamePropertyCollection.cs b/Source/EWSPDIData/PDIProperties/TimeZoneNamePropertyCollection.cs index 57ddaed..e61c3ff 100644 --- a/Source/EWSPDIData/PDIProperties/TimeZoneNamePropertyCollection.cs +++ b/Source/EWSPDIData/PDIProperties/TimeZoneNamePropertyCollection.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeZoneNamePropertyCollection.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a collection class for TimeZoneNameProperty objects. It is used by the Personal Data @@ -65,8 +65,8 @@ public TimeZoneNamePropertyCollection(IList timeZoneNames) /// Returns the new property that was created and added to the collection public TimeZoneNameProperty Add(string tzId) { - TimeZoneNameProperty tzn = new TimeZoneNameProperty(); - tzn.Value = tzId; + TimeZoneNameProperty tzn = new TimeZoneNameProperty { Value = tzId }; + base.Add(tzn); return tzn; diff --git a/Source/EWSPDIData/PDIProperties/TimeZoneOffsetProperty.cs b/Source/EWSPDIData/PDIProperties/TimeZoneOffsetProperty.cs index ca13a2d..2e3da0f 100644 --- a/Source/EWSPDIData/PDIProperties/TimeZoneOffsetProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TimeZoneOffsetProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeZoneOffsetProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Time Zone Offset property classes used by the Personal Data Interchange (PDI) iCalendar @@ -36,9 +36,7 @@ public class TimeZoneOffsetProperty : BaseProperty #region Private data members //===================================================================== - private bool isOffsetFrom; - - private TimeSpan offsetTimeSpan; + private readonly bool isOffsetFrom; #endregion @@ -49,38 +47,22 @@ public class TimeZoneOffsetProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (TZOFFSETFROM or TZOFFSETTO). /// - public override string Tag - { - get - { - return isOffsetFrom ? "TZOFFSETFROM" : "TZOFFSETTO"; - } - } + public override string Tag => isOffsetFrom ? "TZOFFSETFROM" : "TZOFFSETTO"; /// /// This read-only property defines the default value type as UTC-OFFSET /// - public override string DefaultValueLocation - { - get { return ValLocValue.UtcOffset; } - } + public override string DefaultValueLocation => ValLocValue.UtcOffset; /// /// This is used to get or set the value as a object /// - public virtual TimeSpan TimeSpanValue - { - get { return offsetTimeSpan; } - set { offsetTimeSpan = value; } - } + public virtual TimeSpan TimeSpanValue { get; set; } /// /// This property is overridden to handle parsing the time span @@ -91,7 +73,8 @@ public override string Value get { string tz; - int hours = offsetTimeSpan.Hours, mins = offsetTimeSpan.Minutes, secs = offsetTimeSpan.Seconds; + int hours = this.TimeSpanValue.Hours, mins = this.TimeSpanValue.Minutes, + secs = this.TimeSpanValue.Seconds; if(hours < 0 || mins < 0 || secs < 0) tz = String.Format(CultureInfo.InvariantCulture, "-{0:00}{1:00}", hours * -1, mins * -1); @@ -122,8 +105,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/TimeZoneProperty.cs b/Source/EWSPDIData/PDIProperties/TimeZoneProperty.cs index 9548d12..2091f93 100644 --- a/Source/EWSPDIData/PDIProperties/TimeZoneProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TimeZoneProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeZoneProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains Time Zone property class used by the Personal Data Interchange (PDI) classes such as @@ -46,30 +46,18 @@ public class TimeZoneProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1, vCard 3.0, and vCalendar 1.0 - public override SpecificationVersions VersionsSupported - { - get - { - return SpecificationVersions.vCard21 | SpecificationVersions.vCard30 | - SpecificationVersions.vCalendar10; - } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30 | SpecificationVersions.vCalendar10; /// /// This read-only property defines the tag (TZ) /// - public override string Tag - { - get { return "TZ"; } - } + public override string Tag => "TZ"; /// /// This read-only property defines the default value type as UTC-OFFSET /// - public override string DefaultValueLocation - { - get { return ValLocValue.UtcOffset; } - } + public override string DefaultValueLocation => ValLocValue.UtcOffset; /// /// This is used to get or set the time zone as a object @@ -78,7 +66,7 @@ public override string DefaultValueLocation /// text will be lost (VALUE will be reset from TEXT to UTC-OFFSET). public TimeSpan TimeSpanValue { - get { return timeSpan; } + get => timeSpan; set { timeSpan = value; diff --git a/Source/EWSPDIData/PDIProperties/TimeZoneUrlProperty.cs b/Source/EWSPDIData/PDIProperties/TimeZoneUrlProperty.cs index aefb048..7f6212f 100644 --- a/Source/EWSPDIData/PDIProperties/TimeZoneUrlProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TimeZoneUrlProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TimeZoneUrlProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Time Zone URL property class used by the Personal Data Interchange (PDI) iCalendar @@ -37,26 +37,18 @@ public class TimeZoneUrlProperty : UrlProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports iCalendar 2.0 only - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (TZURL) /// - public override string Tag - { - get { return "TZURL"; } - } + public override string Tag => "TZURL"; /// /// This read-only property defines the default value type as URI /// - public override string DefaultValueLocation - { - get { return ValLocValue.Uri; } - } + public override string DefaultValueLocation => ValLocValue.Uri; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/TitleProperty.cs b/Source/EWSPDIData/PDIProperties/TitleProperty.cs index c5ff845..8b9561a 100644 --- a/Source/EWSPDIData/PDIProperties/TitleProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TitleProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : TitleProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Title property class used by the Personal Data Interchange (PDI) vCard class @@ -35,26 +35,19 @@ public class TitleProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCard 2.1 and vCard 3.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCard21 | SpecificationVersions.vCard30; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCard21 | + SpecificationVersions.vCard30; /// /// This read-only property defines the tag (TITLE) /// - public override string Tag - { - get { return "TITLE"; } - } + public override string Tag => "TITLE"; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; + #endregion #region Constructor diff --git a/Source/EWSPDIData/PDIProperties/TriggerProperty.cs b/Source/EWSPDIData/PDIProperties/TriggerProperty.cs index cad929d..f182a52 100644 --- a/Source/EWSPDIData/PDIProperties/TriggerProperty.cs +++ b/Source/EWSPDIData/PDIProperties/TriggerProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : AlarmProperties.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Trigger property used by the Personal Data Interchange (PDI) vCalendar and iCalendar @@ -20,7 +20,6 @@ //=============================================================================================================== using System; -using System.Globalization; using System.Text; namespace EWSoftware.PDI.Properties @@ -38,7 +37,6 @@ public class TriggerProperty : BaseDateTimeProperty //===================================================================== private Duration duration; - private bool relatedToEnd; #endregion @@ -49,36 +47,24 @@ public class TriggerProperty : BaseDateTimeProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports vCalendar 1.0 and iCalendar 2.0 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.vCalendar10 | SpecificationVersions.iCalendar20; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.vCalendar10 | + SpecificationVersions.iCalendar20; /// /// This read-only property defines the tag (TRIGGER) /// - public override string Tag - { - get { return "TRIGGER"; } - } + public override string Tag => "TRIGGER"; /// /// This read-only property defines the default value type as DURATION /// - public override string DefaultValueLocation - { - get { return ValLocValue.Duration; } - } + public override string DefaultValueLocation => ValLocValue.Duration; /// /// This property is used to set or get the related (RELATED) parameter. If true, the trigger is related /// to the end time of the event. If false, the trigger is related to the start time of the event. /// - public bool RelatedToEnd - { - get { return relatedToEnd; } - set { relatedToEnd = value; } - } + public bool RelatedToEnd { get; set; } /// /// This property is used to set or get the duration to use for the trigger. If set, the @@ -87,7 +73,7 @@ public bool RelatedToEnd /// public Duration DurationValue { - get { return duration; } + get => duration; set { duration = value; @@ -102,7 +88,7 @@ public Duration DurationValue /// public override DateTime TimeZoneDateTime { - get { return base.TimeZoneDateTime; } + get => base.TimeZoneDateTime; set { base.TimeZoneDateTime = value; @@ -116,7 +102,7 @@ public override DateTime TimeZoneDateTime /// public override DateTime DateTimeValue { - get { return base.DateTimeValue; } + get => base.DateTimeValue; set { base.DateTimeValue = value; @@ -166,8 +152,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { this.Value = value; } + get => this.Value; + set => this.Value = value; } #endregion @@ -204,7 +190,7 @@ public override object Clone() /// The PDI object from which the settings are to be copied protected override void Clone(PDIObject p) { - relatedToEnd = ((TriggerProperty)p).RelatedToEnd; + this.RelatedToEnd = ((TriggerProperty)p).RelatedToEnd; base.Clone(p); } diff --git a/Source/EWSPDIData/PDIProperties/UniqueIdProperty.cs b/Source/EWSPDIData/PDIProperties/UniqueIdProperty.cs index 76d23fc..761fe31 100644 --- a/Source/EWSPDIData/PDIProperties/UniqueIdProperty.cs +++ b/Source/EWSPDIData/PDIProperties/UniqueIdProperty.cs @@ -2,8 +2,8 @@ // System : Personal Data Interchange Classes // File : UniqueIdProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/24/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains the Unique ID property class used by the Personal Data Interchange (PDI) classes such as @@ -41,18 +41,13 @@ public class UniqueIdProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports all specifications including IrMC 1.1 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.Any | SpecificationVersions.IrMC11; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.Any | + SpecificationVersions.IrMC11; /// /// This read-only property defines the default value type as TEXT /// - public override string DefaultValueLocation - { - get { return ValLocValue.Text; } - } + public override string DefaultValueLocation => ValLocValue.Text; /// /// This read-only property defines the tag. It returns UID for all specifications except IrMC 1.1 which @@ -81,7 +76,7 @@ public override string Value return base.Value; } - set { base.Value = value; } + set => base.Value = value; } /// @@ -89,8 +84,8 @@ public override string Value /// public override string EncodedValue { - get { return this.Value; } - set { base.Value = value; } + get => this.Value; + set => base.Value = value; } #endregion diff --git a/Source/EWSPDIData/PDIProperties/UrlProperty.cs b/Source/EWSPDIData/PDIProperties/UrlProperty.cs index f92053a..e161507 100644 --- a/Source/EWSPDIData/PDIProperties/UrlProperty.cs +++ b/Source/EWSPDIData/PDIProperties/UrlProperty.cs @@ -2,7 +2,7 @@ // System : Personal Data Interchange Classes // File : UrlProperty.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/19/2014 +// Updated : 11/24/2018 // Note : Copyright 2004-2014, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -41,26 +41,18 @@ public class UrlProperty : BaseProperty /// This is used to establish the specification versions supported by the PDI object /// /// Supports all specifications except IrMC 1.1 - public override SpecificationVersions VersionsSupported - { - get { return SpecificationVersions.Any; } - } + public override SpecificationVersions VersionsSupported => SpecificationVersions.Any; /// /// This read-only property defines the tag (URL) /// - public override string Tag - { - get { return "URL"; } - } + public override string Tag => "URL"; /// /// This read-only property defines the default value type as URI /// - public override string DefaultValueLocation - { - get { return ValLocValue.Uri; } - } + public override string DefaultValueLocation => ValLocValue.Uri; + #endregion #region Constructor diff --git a/Source/EWSPDIWeb/EWSoftware.PDI.Web.Controls.csproj b/Source/EWSPDIWeb/EWSoftware.PDI.Web.Controls.csproj index dcf0f70..e176947 100644 --- a/Source/EWSPDIWeb/EWSoftware.PDI.Web.Controls.csproj +++ b/Source/EWSPDIWeb/EWSoftware.PDI.Web.Controls.csproj @@ -9,8 +9,8 @@ EWSoftware PDI Web Controls Library Copyright (c) 2003-2018, Eric Woodruff, All Rights Reserved en - 2018.11.17.0 - 18.11.17.0 + 2018.12.1.0 + 18.12.1.0 This library contains some web controls that can be used to edit recurrence settings. See the project website for the code, a help file, and demos. Eric Woodruff https://raw.githubusercontent.com/EWSoftware/PDI/master/EWSPDI.png diff --git a/Source/EWSPDIWeb/LocalizedResources.cs b/Source/EWSPDIWeb/LocalizedResources.cs index b64a5f8..ae57dec 100644 --- a/Source/EWSPDIWeb/LocalizedResources.cs +++ b/Source/EWSPDIWeb/LocalizedResources.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI ASP.NET Web Server Controls // File : LocalizedResources.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/14/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains some internal classes used to manage the localized resources for the assembly @@ -20,13 +20,12 @@ using System; using System.Reflection; -using System.Globalization; using System.Resources; namespace EWSoftware.PDI { /// - /// This sealed class is used to load resources for the assembly + /// This class is used to load resources for the assembly /// internal static class LR { @@ -41,7 +40,7 @@ internal static class LR private static ResourceManager rm; // This is a helper object used to quickly lock the class when creating the resource manager - private static object syncRoot = new Object(); + private static readonly object syncRoot = new Object(); #endregion @@ -63,10 +62,7 @@ private static ResourceManager Resources { Assembly asm = Assembly.GetExecutingAssembly(); - string baseName = String.Format(CultureInfo.CurrentCulture, "{0}.{1}", - asm.GetName().Name, ResourcesKey); - - rm = new ResourceManager(baseName, asm); + rm = new ResourceManager($"{asm.GetName().Name}.{ResourcesKey}", asm); } } } @@ -90,7 +86,7 @@ internal static string GetString(string name) string s = Resources.GetString(name, null); if(s == null) - s = String.Format(CultureInfo.CurrentCulture, "[?:{0}]", name); + s = $"[?:{name}]"; return s; } diff --git a/Source/EWSPDIWeb/RecurrencePattern.cs b/Source/EWSPDIWeb/RecurrencePattern.cs index 1207cdb..deb6d70 100644 --- a/Source/EWSPDIWeb/RecurrencePattern.cs +++ b/Source/EWSPDIWeb/RecurrencePattern.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI ASP.NET Web Server Controls // File : RecurrencePattern.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/30/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains one of several user controls that are combined to allow the editing of various recurrence @@ -24,6 +24,8 @@ // Bootstrap. //=============================================================================================================== +// Ignore Spelling: runat args + using System; using System.Collections.Specialized; using System.ComponentModel; @@ -64,6 +66,7 @@ public class RecurrencePattern : System.Web.UI.Control, INamingContainer, IPostB // The validator private CustomValidator validator; + #endregion #region Properties @@ -77,8 +80,8 @@ public class RecurrencePattern : System.Web.UI.Control, INamingContainer, IPostB Description("The CSS class name(s) to use for the containing panel")] public string CssPanel { - get { return (string)this.ViewState["CssPanel"]; } - set { this.ViewState["CssPanel"] = value; } + get => (string)this.ViewState["CssPanel"]; + set => this.ViewState["CssPanel"] = value; } /// @@ -89,8 +92,8 @@ public string CssPanel Description("The CSS class name(s) to use for the panel heading")] public string CssPanelHeading { - get { return (string)this.ViewState["CssPanelHeading"]; } - set { this.ViewState["CssPanelHeading"] = value; } + get => (string)this.ViewState["CssPanelHeading"]; + set => this.ViewState["CssPanelHeading"] = value; } /// @@ -101,8 +104,8 @@ public string CssPanelHeading Description("The CSS class name(s) to use for the panel title")] public string CssPanelTitle { - get { return (string)this.ViewState["CssPanelTitle"]; } - set { this.ViewState["CssPanelTitle"] = value; } + get => (string)this.ViewState["CssPanelTitle"]; + set => this.ViewState["CssPanelTitle"] = value; } /// @@ -113,8 +116,8 @@ public string CssPanelTitle Description("The CSS class name(s) to use for the panel body")] public string CssPanelBody { - get { return (string)this.ViewState["CssPanelBody"]; } - set { this.ViewState["CssPanelBody"] = value; } + get => (string)this.ViewState["CssPanelBody"]; + set => this.ViewState["CssPanelBody"] = value; } /// @@ -125,8 +128,8 @@ public string CssPanelBody Description("The CSS class name(s) to use for the input (textbox) controls")] public string CssInput { - get { return (string)this.ViewState["CssInput"]; } - set { this.ViewState["CssInput"] = value; } + get => (string)this.ViewState["CssInput"]; + set => this.ViewState["CssInput"] = value; } /// @@ -137,8 +140,8 @@ public string CssInput Description("The CSS class name(s) to use for the select (combo box) controls")] public string CssSelect { - get { return (string)this.ViewState["CssSelect"]; } - set { this.ViewState["CssSelect"] = value; } + get => (string)this.ViewState["CssSelect"]; + set => this.ViewState["CssSelect"] = value; } /// @@ -149,8 +152,8 @@ public string CssSelect Description("The CSS class name(s) to use for error messages")] public string CssErrorMessage { - get { return (string)this.ViewState["CssErrorMessage"]; } - set { this.ViewState["CssErrorMessage"] = value; } + get => (string)this.ViewState["CssErrorMessage"]; + set => this.ViewState["CssErrorMessage"] = value; } /// @@ -161,8 +164,8 @@ public string CssErrorMessage Description("The CSS class name(s) to use for the button controls")] public string CssButton { - get { return (string)this.ViewState["CssButton"]; } - set { this.ViewState["CssButton"] = value; } + get => (string)this.ViewState["CssButton"]; + set => this.ViewState["CssButton"] = value; } /// @@ -180,7 +183,7 @@ public bool ShowWeekStartDay object oShowWeekStartDay = this.ViewState["ShowWSD"]; return (oShowWeekStartDay == null) ? true : (bool)oShowWeekStartDay; } - set { this.ViewState["ShowWSD"] = value; } + set => this.ViewState["ShowWSD"] = value; } /// @@ -198,7 +201,7 @@ public bool ShowCanOccurOnHoliday object oShowHoliday = this.ViewState["ShowHol"]; return (oShowHoliday == null) ? true : (bool)oShowHoliday; } - set { this.ViewState["ShowHol"] = value; } + set => this.ViewState["ShowHol"] = value; } /// @@ -217,7 +220,7 @@ public bool ShowAdvanced object oShowAdvanced = this.ViewState["ShowAdv"]; return (oShowAdvanced == null) ? true : (bool)oShowAdvanced; } - set { this.ViewState["ShowAdv"] = value; } + set => this.ViewState["ShowAdv"] = value; } /// @@ -772,8 +775,7 @@ protected override void CreateChildControls() if(rRecur == null) { - rRecur = new Recurrence(); - rRecur.StartDateTime = DateTime.Today; + rRecur = new Recurrence { StartDateTime = DateTime.Today }; rRecur.RecurDaily(1); } @@ -881,9 +883,10 @@ protected override void CreateChildControls() LiteralControl cssLink = new LiteralControl(String.Format(CultureInfo.InvariantCulture, "", this.Page.ClientScript.GetWebResourceUrl(typeof(RecurrencePattern), - RecurrencePattern.RecurrencePatternHtml + "RecurrenceStyle.css"))); - - cssLink.ID = "EWS_RP_Stylesheet"; + RecurrencePattern.RecurrencePatternHtml + "RecurrenceStyle.css"))) + { + ID = "EWS_RP_Stylesheet" + }; if(this.Page != null && this.Page.Header != null && this.Page.Header.FindControl(cssLink.ID) == null) this.Page.Header.Controls.Add(cssLink); @@ -897,11 +900,14 @@ protected override void CreateChildControls() // Page_ClientValidate function for __doPostBack (added by OnPreRender). if(this.DetermineRenderUplevel) { - validator = new CustomValidator(); - validator.ID = this.ID + "_Validator"; - validator.ClientValidationFunction = this.ID + "_Validate"; - validator.Display = ValidatorDisplay.None; - validator.ErrorMessage = "The recurrence pattern is not valid"; + validator = new CustomValidator + { + ID = this.ID + "_Validator", + ClientValidationFunction = this.ID + "_Validate", + Display = ValidatorDisplay.None, + ErrorMessage = "The recurrence pattern is not valid" + }; + this.Controls.Add(validator); } else diff --git a/Source/EWSPDIWeb/Scripts/DayInstance.js b/Source/EWSPDIWeb/Scripts/DayInstance.js index 3bd79c6..5599185 100644 --- a/Source/EWSPDIWeb/Scripts/DayInstance.js +++ b/Source/EWSPDIWeb/Scripts/DayInstance.js @@ -2,8 +2,8 @@ // System : EWSoftware.PDI ASP.NET Web Server Controls // File : DayInstance.js // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated: 10/14/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All Rights Reserved +// Updated: 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All Rights Reserved // // This contains the client-side code for the EWSoftware DayInstance object // @@ -13,6 +13,8 @@ // documentation, and source files. //=============================================================================================================== +// Ignore Spelling: nd + var EWSRP_dayList = new Array("SU", "MO", "TU", "WE", "TH", "FR", "SA"); var EWSRP_dayNameList = new Array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"); @@ -33,7 +35,7 @@ function EWSRP_DayInstance(instance, dayOfWeek) // See if another instance equals this one. Returns true if it does, false if it doesn't function EWSRP_DayInstanceEquals(otherInstance) { - return (this.Instance == otherInstance.Instance && this.DayOfWeek == otherInstance.DayOfWeek); + return (this.Instance === otherInstance.Instance && this.DayOfWeek === otherInstance.DayOfWeek); } // Get a description of the day instance @@ -41,12 +43,12 @@ function EWSRP_DayInstanceDescription() { var digits, idx, suffix; - if(this.Instance == 0) + if(this.Instance === 0) return "Any " + EWSRP_dayNameList[this.DayOfWeek]; digits = (this.Instance % 100) * ((this.Instance < 0) ? -1 : 1); - if((digits >= 10 && digits <= 19) || digits % 10 == 0) + if((digits >= 10 && digits <= 19) || digits % 10 === 0) idx = 4; else idx = digits % 10; @@ -85,7 +87,7 @@ function EWSRP_DayInstanceDayName() // Convert the day instance to a string function EWSRP_DayInstanceToString() { - if(this.Instance == 0) + if(this.Instance === 0) return EWSRP_dayList[this.DayOfWeek]; return this.Instance.toString() + EWSRP_dayList[this.DayOfWeek]; diff --git a/Source/EWSPDIWeb/Scripts/RecurrencePattern.js b/Source/EWSPDIWeb/Scripts/RecurrencePattern.js index b18661c..6462126 100644 --- a/Source/EWSPDIWeb/Scripts/RecurrencePattern.js +++ b/Source/EWSPDIWeb/Scripts/RecurrencePattern.js @@ -93,11 +93,11 @@ function EWSRP_LoadByDayValues() instList = this.GetControl("RP_AP_INSTLST"); selIdx = instList.selectedIndex; - while(instList.options.length != 0) + while(instList.options.length !== 0) instList.remove(0); // Certain configurations only uses the day, not the instance - if(this.GetControl("RP_AP_DAY").disabled == "") + if(this.GetControl("RP_AP_DAY").disabled === "") for(idx = 0; idx < this.DayInstanceList.length; idx++) { opt = document.createElement("OPTION"); @@ -224,14 +224,14 @@ function EWSRP_SetMonthlyInterval(dayOfMonth, interval, dayList, occurrence) this.GetControl("RP_MP_INT").value = interval.toString(); this.GetControl("RP_MP_NTHINT").value = interval.toString(); - if(dayList.length == 0) + if(dayList.length === 0) this.SetMonthlyCtlState(true); else { this.SetMonthlyCtlState(false); // If there's only one entry, use it. Otherwise, use the first one plus the indicated occurrence. - if(dayList.length == 1) + if(dayList.length === 1) { if(dayList[0].Instance < 1 || dayList[0].Instance > 4) this.GetControl("RP_MP_INST").selectedIndex = 4; @@ -281,13 +281,13 @@ function EWSRP_SetMonthlyInterval(dayOfMonth, interval, dayList, occurrence) } // If it isn't a combination we can use, it'll use the first day of the week from the list - if(daysUsed == 127) + if(daysUsed === 127) dow = 9; // All days else - if(daysUsed == 65) + if(daysUsed === 65) dow = 8; // Weekend day else - if(daysUsed == 62) + if(daysUsed === 62) dow = 7; // Weekday else dow = dayList[0].DayOfWeek; @@ -327,14 +327,14 @@ function EWSRP_SetYearlyInterval(month, dayOfMonth, interval, dayList, occurrenc this.GetControl("RP_YP_INT").value = interval.toString(); this.GetControl("RP_YP_NTHINT").value = interval.toString(); - if(dayList.length == 0) + if(dayList.length === 0) this.SetYearlyCtlState(true); else { this.SetYearlyCtlState(false); // If there's only one entry, use it. Otherwise, use the first one plus the indicated occurrence. - if(dayList.length == 1) + if(dayList.length === 1) { if(dayList[0].Instance < 1 || dayList[0].Instance > 4) this.GetControl("RP_YP_INST").selectedIndex = 4; @@ -385,13 +385,13 @@ function EWSRP_SetYearlyInterval(month, dayOfMonth, interval, dayList, occurrenc } // If it isn't a combination we can use, it'll use the first day of the week from the list - if(daysUsed == 127) + if(daysUsed === 127) dow = 9; // All days else - if(daysUsed == 65) + if(daysUsed === 65) dow = 8; // Weekend day else - if(daysUsed == 62) + if(daysUsed === 62) dow = 7; // Weekday else dow = dayList[0].DayOfWeek; @@ -433,13 +433,13 @@ function EWSRP_SetAdvancedInterval(pattern, interval, dayList, months, byWeekNo, this.GetControl("RP_AP_INT").value = interval.toString(); - if(typeof(dayList) != "undefined") + if(typeof(dayList) !== "undefined") { - if(typeof(months) != "undefined" && months.length != 0) + if(typeof(months) !== "undefined" && months.length !== 0) for(idx = 0; idx < months.length; idx++) opts[months[idx] - 1].selected = true; - if(typeof(byWeekNo) != "undefined") + if(typeof(byWeekNo) !== "undefined") { this.GetControl("RP_AP_BYWKNO").value = byWeekNo; this.GetControl("RP_AP_BYYRDAY").value = byYearDay; @@ -453,7 +453,7 @@ function EWSRP_SetAdvancedInterval(pattern, interval, dayList, months, byWeekNo, // Set the Day Instance control state which depends on the above settings this.SetDayInstanceState(); - if(this.GetControl("RP_AP_DAY").disabled == "") + if(this.GetControl("RP_AP_DAY").disabled === "") this.DayInstanceList = dayList; else this.DayList = dayList; @@ -517,31 +517,31 @@ function EWSRP_ShowPatternOptions(maxPattern) function EWSRP_SelectPattern(pattern) { // Only validate when the pattern changes - if(this.CurrentPattern != pattern && !this.ValidateRecurrence()) + if(this.CurrentPattern !== pattern && !this.ValidateRecurrence()) { // Keep the old radio button checked if validation fails pattern = this.CurrentPattern; - this.GetControl("RP_RB_YEAR").checked = (pattern == 1); - this.GetControl("RP_RB_MON").checked = (pattern == 2); - this.GetControl("RP_RB_WEEK").checked = (pattern == 3); - this.GetControl("RP_RB_DAY").checked = (pattern == 4); - this.GetControl("RP_RB_HOUR").checked = (pattern == 5); - this.GetControl("RP_RB_MIN").checked = (pattern == 6); - this.GetControl("RP_RB_SEC").checked = (pattern == 7); + this.GetControl("RP_RB_YEAR").checked = (pattern === 1); + this.GetControl("RP_RB_MON").checked = (pattern === 2); + this.GetControl("RP_RB_WEEK").checked = (pattern === 3); + this.GetControl("RP_RB_DAY").checked = (pattern === 4); + this.GetControl("RP_RB_HOUR").checked = (pattern === 5); + this.GetControl("RP_RB_MIN").checked = (pattern === 6); + this.GetControl("RP_RB_SEC").checked = (pattern === 7); return; } var advanced = this.GetControl("RP_CHK_ADV").checked; - this.GetControl("RP_RB_YEAR").checked = (pattern == 1); - this.GetControl("RP_RB_MON").checked = (pattern == 2); - this.GetControl("RP_RB_WEEK").checked = (pattern == 3); - this.GetControl("RP_RB_DAY").checked = (pattern == 4); - this.GetControl("RP_RB_HOUR").checked = (pattern == 5); - this.GetControl("RP_RB_MIN").checked = (pattern == 6); - this.GetControl("RP_RB_SEC").checked = (pattern == 7); + this.GetControl("RP_RB_YEAR").checked = (pattern === 1); + this.GetControl("RP_RB_MON").checked = (pattern === 2); + this.GetControl("RP_RB_WEEK").checked = (pattern === 3); + this.GetControl("RP_RB_DAY").checked = (pattern === 4); + this.GetControl("RP_RB_HOUR").checked = (pattern === 5); + this.GetControl("RP_RB_MIN").checked = (pattern === 6); + this.GetControl("RP_RB_SEC").checked = (pattern === 7); this.CurrentPattern = pattern; @@ -585,7 +585,7 @@ function EWSRP_SelectPattern(pattern) } // By Week # is only used by the Yearly frequency - if(pattern == 1) + if(pattern === 1) this.GetControl("RP_AP_BYWKNO").disabled = ""; else this.GetControl("RP_AP_BYWKNO").disabled = "disabled"; @@ -602,13 +602,13 @@ function EWSRP_SelectPattern(pattern) else { this.GetControl("RP_ADV_PAT").style.display = "none"; - this.GetControl("RP_YEAR_PAT").style.display = (pattern == 1) ? "block" : "none"; - this.GetControl("RP_MON_PAT").style.display = (pattern == 2) ? "block" : "none"; - this.GetControl("RP_WEEK_PAT").style.display = (pattern == 3) ? "block" : "none"; - this.GetControl("RP_DAY_PAT").style.display = (pattern == 4) ? "block" : "none"; - this.GetControl("RP_HOUR_PAT").style.display = (pattern == 5) ? "block" : "none"; - this.GetControl("RP_MIN_PAT").style.display = (pattern == 6) ? "block" : "none"; - this.GetControl("RP_SEC_PAT").style.display = (pattern == 7) ? "block" : "none"; + this.GetControl("RP_YEAR_PAT").style.display = (pattern === 1) ? "block" : "none"; + this.GetControl("RP_MON_PAT").style.display = (pattern === 2) ? "block" : "none"; + this.GetControl("RP_WEEK_PAT").style.display = (pattern === 3) ? "block" : "none"; + this.GetControl("RP_DAY_PAT").style.display = (pattern === 4) ? "block" : "none"; + this.GetControl("RP_HOUR_PAT").style.display = (pattern === 5) ? "block" : "none"; + this.GetControl("RP_MIN_PAT").style.display = (pattern === 6) ? "block" : "none"; + this.GetControl("RP_SEC_PAT").style.display = (pattern === 7) ? "block" : "none"; } } @@ -637,7 +637,7 @@ function EWSRP_SetAdvancedState() monthDay = this.GetControl("RP_AP_BYMODAY").value; monthDay = monthDay.split(/[,\-]/); - if(monthDay.length == 0) + if(monthDay.length === 0) monthDay = 1; else { @@ -649,12 +649,12 @@ function EWSRP_SetAdvancedState() occurrence = this.GetControl("RP_AP_BYPOS").value; - if(occurrence.substr(0, 1) != "-") + if(occurrence.substr(0, 1) !== "-") occurrence = occurrence.split(/[,\-]/); else occurrence = occurrence.substr(1).split(/,/); - if(occurrence.length == 0) + if(occurrence.length === 0) occurrence = 1; else { @@ -663,7 +663,7 @@ function EWSRP_SetAdvancedState() occurrence = 1; } - if(this.GetControl("RP_AP_DAY").disabled == "") + if(this.GetControl("RP_AP_DAY").disabled === "") dayList = this.DayInstanceList; else dayList = this.DayList; @@ -727,7 +727,7 @@ function EWSRP_SetAdvancedState() } // Use Every Week Day if that's what we found - if(daysUsed == 62) + if(daysUsed === 62) this.SetDailyInterval(1, true); else this.SetDailyInterval(interval, false); @@ -1022,10 +1022,10 @@ function EWSRP_SetDayInstanceState() var dayInstCtl, newState, oldState, opts, idx, count; dayInstCtl = this.GetControl("RP_AP_DAY"); - newState = oldState = (dayInstCtl.disabled == ""); + newState = oldState = (dayInstCtl.disabled === ""); // If yearly, see how many months are selected - if(this.CurrentPattern == 1) + if(this.CurrentPattern === 1) { opts = this.GetControl("RP_AP_MOS").options; count = opts.length; @@ -1036,15 +1036,15 @@ function EWSRP_SetDayInstanceState() // If any months are selected, check By Month Day. If no months are selected check By Week No. if(idx < count) - newState = (this.GetControl("RP_AP_BYMODAY").value.length == 0); + newState = (this.GetControl("RP_AP_BYMODAY").value.length === 0); else - newState = (this.GetControl("RP_AP_BYWKNO").value.length == 0); + newState = (this.GetControl("RP_AP_BYWKNO").value.length === 0); } else - if(this.CurrentPattern == 2) // If monthly, check By Month Day - newState = (this.GetControl("RP_AP_BYMODAY").value.length == 0); + if(this.CurrentPattern === 2) // If monthly, check By Month Day + newState = (this.GetControl("RP_AP_BYMODAY").value.length === 0); - if(oldState != newState) + if(oldState !== newState) dayInstCtl.disabled = (newState) ? "" : "disabled"; this.LoadByDayValues(); @@ -1057,23 +1057,23 @@ function EWSRP_AddDayInstance() dayCtl = this.GetControl("RP_AP_DAY"); - if(dayCtl.disabled == "" && !this.ValidateNumeric("RP_AP_DAY", "RP_AP_DAYVAL", -53, 53)) + if(dayCtl.disabled === "" && !this.ValidateNumeric("RP_AP_DAY", "RP_AP_DAYVAL", -53, 53)) return; instList = this.GetControl("RP_AP_INSTLST"); opt = document.createElement("OPTION"); - if(dayCtl.disabled == "") + if(dayCtl.disabled === "") { di = new EWSRP_DayInstance(parseInt(dayCtl.value, 10), this.GetControl("RP_AP_DOW").selectedIndex); - if(this.DayInstanceList.length == 0) + if(this.DayInstanceList.length === 0) this.DayInstanceList[0] = di; else { for(idx = 0; idx < this.DayInstanceList.length; idx++) - if(this.DayInstanceList[idx].Instance == di.Instance && - this.DayInstanceList[idx].DayOfWeek == di.DayOfWeek) + if(this.DayInstanceList[idx].Instance === di.Instance && + this.DayInstanceList[idx].DayOfWeek === di.DayOfWeek) break; // Don't add it if it's already there @@ -1089,12 +1089,12 @@ function EWSRP_AddDayInstance() { di = new EWSRP_DayInstance(0, this.GetControl("RP_AP_DOW").selectedIndex); - if(this.DayList.length == 0) + if(this.DayList.length === 0) this.DayList[0] = di; else { for(idx = 0; idx < this.DayList.length; idx++) - if(this.DayList[idx].DayOfWeek == di.DayOfWeek) + if(this.DayList[idx].DayOfWeek === di.DayOfWeek) break; // Don't add it if it's already there @@ -1130,11 +1130,11 @@ function EWSRP_RemoveDayInstance() instList = this.GetControl("RP_AP_INSTLST"); selIdx = instList.selectedIndex; - if(selIdx == -1) + if(selIdx === -1) instList.selectedIndex = 0; else { - if(this.GetControl("RP_AP_DAY").disabled == "") + if(this.GetControl("RP_AP_DAY").disabled === "") this.DayInstanceList.splice(selIdx, 1); else this.DayList.splice(selIdx, 1); @@ -1144,7 +1144,7 @@ function EWSRP_RemoveDayInstance() if(selIdx < instList.options.length) instList.selectedIndex = selIdx; else - if(instList.options.length != 0) + if(instList.options.length !== 0) instList.selectedIndex = instList.options.length - 1; else this.GetControl("RP_AP_DELINST").disabled = this.GetControl("RP_AP_CLRINST").disabled = "disabled"; @@ -1160,7 +1160,7 @@ function EWSRP_ClearDayInstances() instList = this.GetControl("RP_AP_INSTLST"); - while(instList.options.length != 0) + while(instList.options.length !== 0) instList.remove(0); this.DayList = new Array(); @@ -1184,7 +1184,7 @@ function EWSRP_ValidateRecurrence() pattern += this.GetControl("RP_AP_INT").value + "\xFF"; // Add state flags for each month - opts = this.GetControl("RP_AP_MOS").options; + opts = this.GetControl("RP_AP_MOS").options; for(idx = 0; idx < opts.length; idx++) pattern += opts[idx].selected ? "1" : "0"; @@ -1192,10 +1192,10 @@ function EWSRP_ValidateRecurrence() pattern += "\xFF"; // Add the day instances - if(this.GetControl("RP_AP_DAY").disabled == "") + if(this.GetControl("RP_AP_DAY").disabled === "") for(idx = 0; idx < this.DayInstanceList.length; idx++) - { - if(idx != 0) + { + if(idx !== 0) pattern += ","; pattern += this.DayInstanceList[idx].toString(); @@ -1203,7 +1203,7 @@ function EWSRP_ValidateRecurrence() else for(idx = 0; idx < this.DayList.length; idx++) { - if(idx != 0) + if(idx !== 0) pattern += ","; pattern += this.DayList[idx].toString(); @@ -1211,7 +1211,7 @@ function EWSRP_ValidateRecurrence() pattern += "\xFF"; - if(this.GetControl("RP_AP_BYWKNO").disabled == "") + if(this.GetControl("RP_AP_BYWKNO").disabled === "") pattern += this.GetControl("RP_AP_BYWKNO").value + "\xFF"; else pattern += "\xFF"; @@ -1305,7 +1305,7 @@ function EWSRP_ValidateRecurrence() if(this.GetControl("RP_DP_INST").checked) { isValid = this.ValidateNumeric("RP_DP_INT", "RP_DP_VAL", 1, 999); - pattern += "0\xFF" + this.GetControl("RP_DP_INT").value + "\xFF"; + pattern += "0\xFF" + this.GetControl("RP_DP_INT").value + "\xFF"; } else pattern += "1\xFF"; @@ -1381,7 +1381,7 @@ function EWSRP_ValidateNumeric(textBoxCtlId, msgSpanId, minVal, maxVal) numberCtl.value = numberText; - if(numberText == "" || !/^\-?[0-9]+$/.test(numberText)) + if(numberText === "" || !/^\-?[0-9]+$/.test(numberText)) number = -32767; else number = parseInt(numberText, 10); @@ -1412,7 +1412,7 @@ function EWSRP_ValidateEndDate() parts = dateText.split(/[^0-9]/); // We should have enough parts. If not, return. It's valid as we made it this far. - if(parts.length != 3) + if(parts.length !== 3) return true; sep = dateText.charAt(parts[0].length); @@ -1422,10 +1422,10 @@ function EWSRP_ValidateEndDate() month = parseInt(parts[0], 10); day = parseInt(parts[1], 10); - if(month != endDate.getMonth() + 1 && month != endDate.getDate()) + if(month !== endDate.getMonth() + 1 && month !== endDate.getDate()) return false; - if(day != endDate.getMonth() + 1 && day != endDate.getDate()) + if(day !== endDate.getMonth() + 1 && day !== endDate.getDate()) return false; // Format the parts with leading zeros and add a full 4 digit year. We make no assumption about the order @@ -1444,7 +1444,7 @@ function EWSRP_ValidateEndDate() else year += 1900; - if(year != endDate.getFullYear()) + if(year !== endDate.getFullYear()) return false; endDateCtl.value = parts[0] + sep + parts[1] + sep + year.toString(); diff --git a/Source/EWSPDIWinForms/AdvancedPattern.resx b/Source/EWSPDIWinForms/AdvancedPattern.resx index 3c5cb46..8a113ac 100644 --- a/Source/EWSPDIWinForms/AdvancedPattern.resx +++ b/Source/EWSPDIWinForms/AdvancedPattern.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + 12, 6 - 88, 23 + 111, 23 - + 0 @@ -142,7 +142,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -151,10 +151,10 @@ 27 - 106, 6 + 129, 5 - 48, 22 + 65, 26 1 @@ -166,7 +166,7 @@ udcInterval - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -178,7 +178,7 @@ NoControl - 160, 6 + 200, 6 104, 23 @@ -196,7 +196,7 @@ lblInterval - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -208,10 +208,10 @@ NoControl - 16, 304 + 10, 304 - 430, 24 + 473, 24 15 @@ -223,7 +223,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -235,10 +235,10 @@ NoControl - 19, 336 + 15, 333 - 96, 23 + 131, 23 16 @@ -253,7 +253,7 @@ label3 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -262,10 +262,10 @@ 25 - 121, 336 + 152, 331 - 312, 22 + 327, 26 17 @@ -274,7 +274,7 @@ txtByWeekNo - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -283,10 +283,10 @@ 24 - 121, 360 + 152, 363 - 312, 22 + 327, 26 19 @@ -295,7 +295,7 @@ txtByYearDay - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -307,10 +307,10 @@ NoControl - 14, 360 + 15, 365 - 101, 23 + 131, 23 18 @@ -325,7 +325,7 @@ label5 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -334,10 +334,10 @@ 23 - 121, 384 + 152, 395 - 312, 22 + 327, 26 21 @@ -346,7 +346,7 @@ txtByMonthDay - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -358,10 +358,10 @@ NoControl - 11, 384 + 15, 397 - 104, 23 + 131, 23 20 @@ -376,7 +376,7 @@ label6 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -385,10 +385,10 @@ 21 - 121, 408 + 152, 427 - 312, 22 + 327, 26 23 @@ -397,7 +397,7 @@ txtByHour - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -409,10 +409,10 @@ NoControl - 43, 408 + 15, 429 - 72, 23 + 131, 23 22 @@ -427,7 +427,7 @@ label8 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -436,10 +436,10 @@ 19 - 121, 432 + 152, 459 - 312, 22 + 327, 26 25 @@ -448,7 +448,7 @@ txtByMinute - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -460,10 +460,10 @@ NoControl - 38, 432 + 15, 461 - 77, 23 + 131, 23 24 @@ -478,7 +478,7 @@ label9 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -487,10 +487,10 @@ 17 - 121, 456 + 152, 491 - 312, 22 + 327, 26 27 @@ -499,7 +499,7 @@ txtBySecond - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -511,10 +511,10 @@ NoControl - 22, 456 + 15, 493 - 93, 23 + 131, 23 26 @@ -529,7 +529,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -538,10 +538,10 @@ 15 - 121, 480 + 152, 523 - 312, 22 + 327, 26 29 @@ -550,7 +550,7 @@ txtBySetPos - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -562,10 +562,10 @@ NoControl - 5, 480 + 15, 525 - 110, 23 + 131, 23 28 @@ -580,7 +580,7 @@ label7 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -588,11 +588,14 @@ 13 + + False + 16, 80 - 144, 208 + 163, 208 5 @@ -601,7 +604,7 @@ lbByMonth - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -616,7 +619,7 @@ 16, 48 - 82, 23 + 99, 23 4 @@ -631,7 +634,7 @@ label10 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -643,10 +646,10 @@ False - 16 + 20 - 184, 80 + 211, 80 168, 208 @@ -658,7 +661,7 @@ lbByDay - System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -670,10 +673,10 @@ NoControl - 174, 47 + 201, 47 - 56, 23 + 73, 23 7 @@ -688,7 +691,7 @@ label11 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -697,10 +700,10 @@ 8 - 240, 48 + 280, 47 - 48, 22 + 65, 26 8 @@ -712,7 +715,7 @@ udcDayInstance - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -724,7 +727,7 @@ 8, 288 - 432, 8 + 475, 8 14 @@ -733,7 +736,7 @@ groupBox1 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -745,7 +748,7 @@ 8, 32 - 432, 8 + 475, 8 3 @@ -754,7 +757,7 @@ groupBox2 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -763,7 +766,7 @@ 5 - 168, 40 + 195, 40 2, 248 @@ -775,7 +778,7 @@ groupBox3 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -784,16 +787,16 @@ 4 - 16 + 20 - 296, 48 + 351, 46 12 - 112, 24 + 130, 28 9 @@ -802,7 +805,7 @@ cboDOW - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -814,10 +817,10 @@ NoControl - 360, 80 + 387, 80 - 75, 28 + 96, 28 11 @@ -829,7 +832,7 @@ btnAdd - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -841,10 +844,10 @@ NoControl - 360, 114 + 387, 114 - 75, 28 + 96, 28 12 @@ -856,7 +859,7 @@ btnRemove - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -868,10 +871,10 @@ NoControl - 360, 148 + 387, 148 - 75, 28 + 96, 28 13 @@ -883,7 +886,7 @@ btnClear - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -891,19 +894,19 @@ 0 - + True True - 450, 512 + 494, 559 AdvancedPattern - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/EWSPDIWinForms/BrowseControl.cs b/Source/EWSPDIWinForms/BrowseControl.cs index 374db27..5d93de7 100644 --- a/Source/EWSPDIWinForms/BrowseControl.cs +++ b/Source/EWSPDIWinForms/BrowseControl.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI Windows Forms Controls // File : BrowseControl.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/14/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to move forward and backward through a collection of objects. It can also add objects to and @@ -41,19 +41,14 @@ public partial class BrowseControl : System.Windows.Forms.UserControl /// This property is used to get a reference to the binding source /// [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public BindingSource BindingSource - { - get { return bindingSource; } - } + public BindingSource BindingSource => bindingSource; /// /// This property is used to get a reference to the error provider control /// [Category("Misc"), Bindable(false), Description("Error provider settings")] - public ErrorProvider ErrorProvider - { - get { return epErrors; } - } + public ErrorProvider ErrorProvider => epErrors; + #endregion #region Constructor @@ -62,7 +57,7 @@ public ErrorProvider ErrorProvider /// /// Constructor /// - public BrowseControl() + public BrowseControl() { InitializeComponent(); } diff --git a/Source/EWSPDIWinForms/BrowseControl.resx b/Source/EWSPDIWinForms/BrowseControl.resx index 126056c..4032f50 100644 --- a/Source/EWSPDIWinForms/BrowseControl.resx +++ b/Source/EWSPDIWinForms/BrowseControl.resx @@ -127,20 +127,19 @@ 87 - 278, 17 + 327, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScgAA - EnIBXmVb4wAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckCpBtw - fjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++Qeb/ - qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ/5Ny - NDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vAzpX/ - v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/IPb7 - 35qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5ErkJg - gg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJyAAAScgFeZVvjAAABSklE + QVQ4T2MYvODuAvb/t+Zx/r86h+v/xRm8/6HCxIPrQI1/HjX+//Ow4f/JyQKkG3B+Oi/cgIM9IqQbcHyS + IFBz3f8/D6r+72gXJ2zApZk8/89O5ft/EqjxSL/Q/33dIkDN5f//3iv6v75B5v+qGrn/SysV/88vVf4/ + q0gV08BTQH/+eVgP1FQLxJX//9wrAeK8/3/vZv7/eyf5/9/bcf//3YwA4pD/k3I0MQ041CsMdu7f+6VA + jQVAjdlAjalAjQn//92KBmoM+//vRtD/f9f9/nel6WIasLNd4v+WZqn/68DOlf+/pELx/99bMUCN4f+n + 5mn8n5Cl9b87Q/d/e6r+/+ZEQ8JhMhvoT5Bz/90I+N+ToUNYAzoA+fPfDX8g9vvfmqxPugHd6bpg/4Jw + fZwR6Qa0JBn8b4g3/F8Ta/y/MtqEdAPoBBgYACQj2J51/IhpAAAAAElFTkSuQmCC @@ -148,16 +147,16 @@ True - 24, 24 + 24, 25 Add new - 123, 17 + 147, 17 - 45, 24 + 54, 25 of {0} @@ -167,22 +166,22 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScgAA - EnIBXmVb4wAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVCDrhI - DiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXCrIet - 9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMVi9OI - ytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG86CN - hdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmGQQvo - kjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumXbO+G - 80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJyAAAScgFeZVvjAAABb0lE + QVQ4T7WQTSjDYRzHd1XeSu3iglo5IJO8hGQypLHIhMjMJAcOi4R2cXAg5UIOuEgOJCXlROI0b/Pamlp/ + LVLaBf+4PB9jqLW/seJ7eep5vt/P7/v8VH8iXCfQbQTHDh9XkYmVeURnFcKsh631sBC8HliaCfawtgC9 + JkS7HtFRAXMTipC3hsJcBiM9oe+cOgKQumxEYwHYmoJMYsiKMOXCpD1sQxWL04jK1HcQw1Zwn8FYfwDq + Pz9s4YXHBc3FgS8ZsxD1edDX8rvwp9jf9VfOQxjSoUYbYfhGgsZCyElA1sbzoI2F2uxf1r+5BlM+FCXi + sxjg4uh9uXdpfsjy7A8LvL+DVh2PJUm4S9Px7W1/BRi14dTEIJ8cKEN4eYZBC+iSOU5T49tYDTHelmcg + tVUje69DIexuIueqcaZEIXU1gPykOGlHE4fsdCgApkaQUqNx6zNBulKu6Zds74bzQwXApRPGB+Bw79vw + P0ilegWKIwMchCbSyQAAAABJRU5ErkJggg== True - 24, 24 + 24, 25 Delete @@ -193,46 +192,46 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScgAA - EnIBXmVb4wAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77wf/g - hmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0v3f1 - BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvgUXX/ - f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbAIu/O - /9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPulf8g - BXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJyAAAScgFeZVvjAAABKklE + QVQ4T2MYPKBw1vP/TQue/8+c+Pg/VAgDhLc/wCnHkDvz2f9VR97/x6UovvvB/+CGa7gNyJjy9P/CfR+w + Korvefh/6f7///2rL+A2IKHnyf9pW95jKIpovw/WnDnr/3+v0hO4DYjsevS/d/UHFEWhrffAmlvXAW3v + /PvfJf8AbgMCmx/+r5v/Dq4ouOXu/0V7///vAGrOmPPzv13dz//2GdtxG+BRdf9//rQ3KIrsim//T5/z + +79/17f/OoXv/lskrMdtgH3p3f/Zk19jKNJPOf/fpOjFf5WsT/+NI5fhNsAi787/1P7XWBUZJJ34L5v2 + 9b9u8DzcBhhm3f4f1vISpyL91Mv/NXyn4TZAJ+3Gf7/qh3gVqXhMwG2AU+6V/yAFeBUNQsDAAADwdsCr + peWacAAAAABJRU5ErkJggg== True - 24, 24 + 24, 25 Move first - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScgAA - EnIBXmVb4wAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w5sxZ - //97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6fPuf3 - f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+08g3 - AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJyAAAScgFeZVvjAAAAtklE + QVQ4T2MYOiC8/cF/KJN0EN/94H9wwzXyDIjvefh/6f7///2rL5BuQET7fbDmzFn//3uVniDNgNDWe2DN + reuAtnf+/e+Sf4B4A4Jb7v5ftPf//w6g5ow5P//b1f38b5+xnTQX2BXf/p8+5/d//65v/3UK3/23SFhP + ehjop5z/b1L04r9K1qf/xpHLSDcABAySTvyXTfv6Xzd4HnkGgIB+6uX/Gr7TyDcABFQ8JlBmwGAFDAwA + 0BRgmAS6UFUAAAAASUVORK5CYII= True - 24, 24 + 24, 25 Move previous - 6, 27 + 6, 28 Position @@ -250,56 +249,56 @@ Current position - 6, 27 + 6, 28 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScgAA - EnIBXmVb4wAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78n73v - 1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuIN8Sj - 6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5foAc0 - QjgAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJyAAAScgFeZVvjAAAAo0lE + QVQ4T2MYfKBw1vP/UCZ5IHfms/8J3ffINyRjytP/8/b//p/QdYc8QxJ6nvyfve/X/86tf/+7lV4m3ZDI + rkf/p2z79b9k6d//CdP//rfJPUuaIYHND/+3rn0P1mxc8uW/dPS1/8aRy4g3xKPq/v+Sue/gmhVdekhz + gX3p3f+BLc/I0wwCFnl3/tsUXCFPMwgYZt0mXzMI6KTdIF/zUAQMDACgfl+gBzRCOAAAAABJRU5ErkJg + gg== True - 24, 24 + 24, 25 Move next - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScgAA - EnIBXmVb4wAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//h7c/ - wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30BtwGR - XY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYAkqub - /+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwGWOTd - +W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq98l/F - YwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJyAAAScgFeZVvjAAABLElE + QVQ4T2MYXKBw1vP/UCYGAMk1LXj+P3PiY5xqGHJnPvuf0H0PqwKQ3Koj7/+Htz/AbUDGlKf/5+3//T+h + 6w6GIpDcwn0f/gc3XMNtQELPk/+z9/3637n173+30ssoCkFy07a8/+9ffQG3AZFdj/5P2fbrf8nSv/8T + pv/9b5N7Fq4YJNe7+sN/r9ITuA0IbH74v3Xte7Bm45Iv/6Wjr/03jlwG1gCSq5v/7r9L/gHcBnhU3f9f + MvcdXLOiSw9cMUguf9qb//YZ23EbYF96939gyzMMzSAAksue/Pq/RcJ63AZY5N35b1NwBUMzCIDkUvtf + w72EFRhm3caqGQRAcmEtL//rBs/DbYBO2g2ckiA5v+qH/zV8p+E2AB9wyr3yX8VjAhhDhQYFYGAAAL7R + v7O5DE6cAAAAAElFTkSuQmCC True - 24, 24 + 24, 25 Move last - 6, 27 + 6, 28 - 0, 161 + 0, 160 - 354, 27 + 354, 28 900 diff --git a/Source/EWSPDIWinForms/DailyPattern.resx b/Source/EWSPDIWinForms/DailyPattern.resx index c99841c..a262dc7 100644 --- a/Source/EWSPDIWinForms/DailyPattern.resx +++ b/Source/EWSPDIWinForms/DailyPattern.resx @@ -126,7 +126,7 @@ 8, 8 - 72, 24 + 84, 24 @@ -178,7 +178,7 @@ NoControl - 126, 9 + 155, 9 56, 23 @@ -205,10 +205,10 @@ 1 - 72, 10 + 88, 8 - 48, 26 + 61, 26 1 @@ -232,7 +232,7 @@ True - 210, 72 + 266, 72 DailyPattern diff --git a/Source/EWSPDIWinForms/EWSoftware.PDI.Windows.Forms.csproj b/Source/EWSPDIWinForms/EWSoftware.PDI.Windows.Forms.csproj index 329131a..dc0e613 100644 --- a/Source/EWSPDIWinForms/EWSoftware.PDI.Windows.Forms.csproj +++ b/Source/EWSPDIWinForms/EWSoftware.PDI.Windows.Forms.csproj @@ -9,8 +9,8 @@ EWSoftware PDI Windows Forms Control Library Copyright (c) 2003-2018, Eric Woodruff, All Rights Reserved en - 2018.11.17.0 - 18.11.17.0 + 2018.12.1.0 + 18.12.1.0 This library contains some Windows Forms controls that can be used to edit holiday calculation settings and to edit recurrence settings. See the project website for the code, a help file, and demos. Eric Woodruff https://raw.githubusercontent.com/EWSoftware/PDI/master/EWSPDI.png @@ -32,6 +32,15 @@ true + + + + + + + + + diff --git a/Source/EWSPDIWinForms/HolidayManager.cs b/Source/EWSPDIWinForms/HolidayManager.cs index 417d839..f3569fe 100644 --- a/Source/EWSPDIWinForms/HolidayManager.cs +++ b/Source/EWSPDIWinForms/HolidayManager.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI Windows Forms Controls // File : HolidayManager.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/17/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains a user controls that can be used to manage a set of holidays in a HolidayCollection @@ -58,12 +58,8 @@ public partial class HolidayManager : System.Windows.Forms.UserControl Description("Show or hide the Load/Save buttons")] public bool ShowLoadSaveControls { - get { return loadSaveVisible; } - set - { - - loadSaveVisible = btnLoad.Visible = btnSave.Visible = value; - } + get => loadSaveVisible; + set => loadSaveVisible = btnLoad.Visible = btnSave.Visible = value; } /// @@ -82,7 +78,7 @@ public bool ShowLoadSaveControls [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IEnumerable Holidays { - get { return holidays; } + get => holidays; set { holidays.Clear(); diff --git a/Source/EWSPDIWinForms/HolidayPropertiesDlg.Designer.cs b/Source/EWSPDIWinForms/HolidayPropertiesDlg.Designer.cs index d240158..a0bf119 100644 --- a/Source/EWSPDIWinForms/HolidayPropertiesDlg.Designer.cs +++ b/Source/EWSPDIWinForms/HolidayPropertiesDlg.Designer.cs @@ -152,6 +152,11 @@ private void InitializeComponent() 0, -2147483648}); this.udcOffset.Name = "udcOffset"; + this.udcOffset.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); // // udcDayOfMonth // diff --git a/Source/EWSPDIWinForms/HolidayPropertiesDlg.cs b/Source/EWSPDIWinForms/HolidayPropertiesDlg.cs index 91d8ef3..6a492a4 100644 --- a/Source/EWSPDIWinForms/HolidayPropertiesDlg.cs +++ b/Source/EWSPDIWinForms/HolidayPropertiesDlg.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI Windows Forms Controls // File : HolidayPropertiesDlg.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/21/2014 -// Note : Copyright 2003-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to add or edit holiday object information @@ -32,6 +32,7 @@ public partial class HolidayPropertiesDlg : System.Windows.Forms.Form //===================================================================== private Holiday holiday; + #endregion #region Properties @@ -44,18 +45,13 @@ public partial class HolidayPropertiesDlg : System.Windows.Forms.Form /// null. public Holiday HolidayInfo { - get { return holiday; } + get => holiday; set { - if(value == null) - throw new ArgumentNullException("value", LR.GetString("ExHAEHolidayIsNull")); - - holiday = value; + holiday = value ?? throw new ArgumentNullException(nameof(value), LR.GetString("ExHAEHolidayIsNull")); - if(holiday is FloatingHoliday) + if(holiday is FloatingHoliday fl) { - FloatingHoliday fl = (FloatingHoliday)holiday; - cboOccurrence.SelectedValue = fl.Occurrence; cboDayOfWeek.SelectedValue = fl.Weekday; udcOffset.Value = (fl.Offset < -999) ? -999 : (fl.Offset > 999) ? 999 : fl.Offset; diff --git a/Source/EWSPDIWinForms/HolidayPropertiesDlg.resx b/Source/EWSPDIWinForms/HolidayPropertiesDlg.resx index 993ef7f..9e53791 100644 --- a/Source/EWSPDIWinForms/HolidayPropertiesDlg.resx +++ b/Source/EWSPDIWinForms/HolidayPropertiesDlg.resx @@ -123,7 +123,7 @@ - 16, 331 + 12, 337 117, 40 @@ -151,7 +151,7 @@ NoControl - 477, 331 + 480, 337 118, 40 @@ -178,7 +178,7 @@ NoControl - 11, 20 + 13, 19 120, 29 @@ -229,7 +229,7 @@ NoControl - 53, 61 + 55, 60 78, 29 @@ -286,7 +286,7 @@ NoControl - 25, 241 + 25, 240 179, 30 @@ -313,7 +313,7 @@ NoControl - 212, 242 + 214, 241 141, 29 @@ -343,7 +343,7 @@ NoControl - 279, 201 + 281, 200 74, 30 @@ -400,7 +400,7 @@ NoControl - 228, 122 + 230, 121 125, 29 @@ -430,7 +430,7 @@ NoControl - 191, 162 + 193, 161 162, 29 @@ -526,7 +526,7 @@ 361, 243 - 64, 26 + 65, 26 13 @@ -550,7 +550,7 @@ 361, 203 - 64, 26 + 65, 26 11 @@ -574,7 +574,7 @@ NoControl - 233, 284 + 139, 289 352, 30 diff --git a/Source/EWSPDIWinForms/HourlyPattern.resx b/Source/EWSPDIWinForms/HourlyPattern.resx index 46c10d9..11414a9 100644 --- a/Source/EWSPDIWinForms/HourlyPattern.resx +++ b/Source/EWSPDIWinForms/HourlyPattern.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + - 110, 8 + 130, 8 - 56, 23 + 76, 23 - + 2 @@ -142,7 +142,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -151,10 +151,10 @@ 1 - 56, 9 + 63, 7 - 48, 22 + 61, 26 1 @@ -166,7 +166,7 @@ udcHours - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -181,7 +181,7 @@ 2, 8 - 48, 23 + 55, 23 0 @@ -196,7 +196,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -204,16 +204,16 @@ 2 - + True - 176, 40 + 220, 40 HourlyPattern - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/EWSPDIWinForms/LocalizedResources.cs b/Source/EWSPDIWinForms/LocalizedResources.cs index 3ae1d20..cccde58 100644 --- a/Source/EWSPDIWinForms/LocalizedResources.cs +++ b/Source/EWSPDIWinForms/LocalizedResources.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI Windows Forms Controls // File : LocalizedResources.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/21/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/22/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains some internal classes used to manage the localized resources for the assembly @@ -41,7 +41,7 @@ internal static class LR private static ResourceManager rm; // This is a helper object used to quickly lock the class when creating the resource manager - private static object syncRoot = new Object(); + private static readonly object syncRoot = new Object(); #endregion @@ -63,10 +63,7 @@ private static ResourceManager Resources { Assembly asm = Assembly.GetExecutingAssembly(); - string baseName = String.Format(CultureInfo.CurrentCulture, "{0}.{1}", - asm.GetName().Name, ResourcesKey); - - rm = new ResourceManager(baseName, asm); + rm = new ResourceManager($"{asm.GetName().Name}.{ResourcesKey}", asm); } } } @@ -90,7 +87,7 @@ internal static string GetString(string name) string s = Resources.GetString(name, null); if(s == null) - s = String.Format(CultureInfo.CurrentCulture, "[?:{0}]", name); + s = $"[?:{name}]"; return s; } diff --git a/Source/EWSPDIWinForms/MinutelyPattern.resx b/Source/EWSPDIWinForms/MinutelyPattern.resx index 1f589f1..649fb7d 100644 --- a/Source/EWSPDIWinForms/MinutelyPattern.resx +++ b/Source/EWSPDIWinForms/MinutelyPattern.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + - 110, 8 + 130, 8 - 74, 23 + 90, 23 - + 2 @@ -142,7 +142,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -151,10 +151,10 @@ 1 - 56, 9 + 63, 7 - 48, 22 + 61, 26 1 @@ -166,7 +166,7 @@ udcMinutes - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -181,7 +181,7 @@ 2, 8 - 48, 23 + 55, 23 0 @@ -196,7 +196,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -204,16 +204,16 @@ 2 - + True - 194, 40 + 232, 40 MinutelyPattern - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/EWSPDIWinForms/MonthlyPattern.resx b/Source/EWSPDIWinForms/MonthlyPattern.resx index b3fe02e..c5198d4 100644 --- a/Source/EWSPDIWinForms/MonthlyPattern.resx +++ b/Source/EWSPDIWinForms/MonthlyPattern.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + - 115, 9 + 147, 9 66, 23 - + 3 @@ -142,7 +142,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -154,10 +154,10 @@ NoControl - 8, 40 + 6, 42 - 56, 24 + 68, 24 1 @@ -169,7 +169,7 @@ rbDayOfWeek - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -181,10 +181,10 @@ NoControl - 8, 8 + 6, 8 - 56, 24 + 68, 24 0 @@ -196,7 +196,7 @@ rbDayXEveryYMonths - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -208,10 +208,10 @@ NoControl - 230, 9 + 286, 9 - 64, 23 + 86, 23 5 @@ -226,7 +226,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -235,16 +235,16 @@ 7 - 16 + 20 - 64, 41 + 80, 41 12 - 80, 24 + 95, 28 6 @@ -253,7 +253,7 @@ cboOccurrence - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -262,16 +262,16 @@ 6 - 16 + 20 - 150, 41 + 181, 41 12 - 120, 24 + 135, 28 7 @@ -280,7 +280,7 @@ cboDOW - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -292,7 +292,7 @@ NoControl - 389, 41 + 460, 43 72, 23 @@ -310,7 +310,7 @@ label3 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -322,7 +322,7 @@ NoControl - 275, 41 + 322, 43 74, 23 @@ -340,7 +340,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -349,10 +349,10 @@ 4 - 64, 10 + 80, 8 - 48, 22 + 61, 26 2 @@ -364,7 +364,7 @@ udcDay - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -373,10 +373,10 @@ 2 - 176, 10 + 219, 8 - 48, 22 + 61, 26 4 @@ -388,7 +388,7 @@ udcMonths - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -397,10 +397,10 @@ 1 - 335, 42 + 393, 42 - 48, 22 + 61, 26 9 @@ -412,7 +412,7 @@ udcDOWMonths - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -420,16 +420,16 @@ 0 - + True - 464, 74 + 537, 74 MonthlyPattern - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/EWSPDIWinForms/RecurrencePattern.cs b/Source/EWSPDIWinForms/RecurrencePattern.cs index 2f67069..459467e 100644 --- a/Source/EWSPDIWinForms/RecurrencePattern.cs +++ b/Source/EWSPDIWinForms/RecurrencePattern.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI Windows Forms Controls // File : RecurrencePattern.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // This file contains one of several user controls that are combined to allow the editing of various recurrence @@ -54,11 +54,11 @@ public partial class RecurrencePattern : System.Windows.Forms.UserControl /// If hidden, the Week Start Day combo box will not be visible and a default week start day /// will be used in all recurrences edited by the control. [Category("Behavior"), DefaultValue(true), Bindable(true), - Description("Show or hide the Week Start Day combo box")] + Description("Show or hide the Week Start Day combo box")] public bool ShowWeekStartDay { - get { return weekStartDayVisible; } - set { weekStartDayVisible = lblWeekStartDay.Visible = cboWeekStartDay.Visible = value; } + get => weekStartDayVisible; + set => weekStartDayVisible = lblWeekStartDay.Visible = cboWeekStartDay.Visible = value; } /// @@ -68,10 +68,10 @@ public bool ShowWeekStartDay /// If hidden, the check box will not be visible and the option will be set to true in all /// recurrences edited by the control. [Category("Behavior"), DefaultValue(true), Bindable(true), - Description("Show or hide the Can Occur on Holiday checkbox")] + Description("Show or hide the Can Occur on Holiday checkbox")] public bool ShowCanOccurOnHoliday { - get { return holidayVisible; } + get => holidayVisible; set { holidayVisible = chkHolidays.Visible = value; @@ -89,11 +89,10 @@ public bool ShowCanOccurOnHoliday /// If hidden, only basic patterns similar to those in Microsoft Outlook can be created. When /// edited, all advanced options currently in effect will be lost and the pattern will be made to conform /// to the simple options available for the currently selected frequency. - [Category("Behavior"), DefaultValue(true), Bindable(true), - Description("Show or hide the Advanced checkbox")] + [Category("Behavior"), DefaultValue(true), Bindable(true), Description("Show or hide the Advanced checkbox")] public bool ShowAdvanced { - get { return advancedVisible; } + get => advancedVisible; set { advancedVisible = chkAdvanced.Visible = value; @@ -119,7 +118,7 @@ public bool ShowAdvanced Bindable(true), Description("This determines the maximum editable recurrence pattern type")] public RecurFrequency MaximumPattern { - get { return maxPattern; } + get => maxPattern; set { if(value == RecurFrequency.Undefined) @@ -199,19 +198,19 @@ public RecurFrequency MaximumPattern Description("Show or hide the time value in the 'end by date' option")] public bool ShowEndTime { - get { return (dtpEndDate.Width == 190); } + get => (dtpEndDate.Width == 235); set { // Set the date/time pattern based on the current culture if(value) { - dtpEndDate.Width = 190; + dtpEndDate.Width = 235; dtpEndDate.CustomFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " " + CultureInfo.CurrentCulture.DateTimeFormat.LongTimePattern; } else { - dtpEndDate.Width = 110; + dtpEndDate.Width = 135; dtpEndDate.CustomFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern; } } @@ -253,7 +252,7 @@ public void GetRecurrence(Recurrence recurrence) Recurrence r = new Recurrence(); if(recurrence == null) - throw new ArgumentNullException("recurrence", LR.GetString("ExRPRecurrenceIsNull")); + throw new ArgumentNullException(nameof(recurrence), LR.GetString("ExRPRecurrenceIsNull")); // Get the basic stuff r.Reset(); diff --git a/Source/EWSPDIWinForms/RecurrencePattern.resx b/Source/EWSPDIWinForms/RecurrencePattern.resx index ea9b0f7..6aad825 100644 --- a/Source/EWSPDIWinForms/RecurrencePattern.resx +++ b/Source/EWSPDIWinForms/RecurrencePattern.resx @@ -129,10 +129,10 @@ - 8, 240 + 8, 316 - 93, 24 + 115, 24 @@ -157,7 +157,7 @@ NoControl - 10, 168 + 10, 215 93, 24 @@ -184,7 +184,7 @@ NoControl - 10, 144 + 10, 185 93, 24 @@ -211,7 +211,7 @@ NoControl - 10, 120 + 10, 155 93, 24 @@ -238,10 +238,10 @@ Top, Bottom, Left - 109, 16 + 129, 16 - 2, 248 + 2, 324 8 @@ -262,7 +262,7 @@ 8, 8 - 192, 56 + 220, 56 10 @@ -271,7 +271,7 @@ ucSecondly - EWSoftware.PDI.Windows.Forms.SecondlyPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.SecondlyPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 pnlPatterns @@ -283,7 +283,7 @@ 8, 8 - 176, 56 + 220, 56 10 @@ -292,7 +292,7 @@ ucHourly - EWSoftware.PDI.Windows.Forms.HourlyPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.HourlyPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 pnlPatterns @@ -304,7 +304,7 @@ 8, 8 - 184, 56 + 220, 56 10 @@ -313,7 +313,7 @@ ucMinutely - EWSoftware.PDI.Windows.Forms.MinutelyPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.MinutelyPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 pnlPatterns @@ -325,7 +325,7 @@ 8, 8 - 185, 80 + 242, 80 10 @@ -334,7 +334,7 @@ ucDaily - EWSoftware.PDI.Windows.Forms.DailyPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.DailyPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 pnlPatterns @@ -346,7 +346,7 @@ 8, 8 - 408, 104 + 485, 104 10 @@ -355,7 +355,7 @@ ucWeekly - EWSoftware.PDI.Windows.Forms.WeeklyPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.WeeklyPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 pnlPatterns @@ -367,7 +367,7 @@ 8, 8 - 460, 88 + 544, 88 10 @@ -376,7 +376,7 @@ ucMonthly - EWSoftware.PDI.Windows.Forms.MonthlyPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.MonthlyPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 pnlPatterns @@ -388,7 +388,7 @@ 8, 8 - 430, 112 + 485, 112 10 @@ -397,7 +397,7 @@ ucYearly - EWSoftware.PDI.Windows.Forms.YearlyPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.YearlyPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 pnlPatterns @@ -406,10 +406,10 @@ 6 - 120, 16 + 140, 20 - 472, 128 + 555, 128 9 @@ -430,7 +430,7 @@ NoControl - 10, 24 + 10, 35 93, 24 @@ -457,7 +457,7 @@ NoControl - 10, 48 + 10, 65 93, 24 @@ -484,7 +484,7 @@ NoControl - 10, 72 + 10, 95 93, 24 @@ -511,7 +511,7 @@ NoControl - 10, 96 + 10, 125 93, 24 @@ -541,10 +541,10 @@ True - 120, 24 + 141, 24 - 472, 240 + 546, 316 10 @@ -556,7 +556,7 @@ ucAdvanced - EWSoftware.PDI.Windows.Forms.AdvancedPattern, EWSoftware.PDI.Windows.Forms, Version=2014.12.30.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.AdvancedPattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 grpPattern @@ -568,7 +568,7 @@ 8, 8 - 600, 272 + 701, 348 0 @@ -592,13 +592,13 @@ Bottom, Left, Right - 16 + 20 445, 24 - 121, 24 + 130, 28 7 @@ -619,10 +619,10 @@ NoControl - 323, 24 + 288, 26 - 114, 23 + 151, 23 6 @@ -646,10 +646,10 @@ 1 - 98, 51 + 129, 57 - 48, 22 + 65, 26 2 @@ -673,10 +673,10 @@ MM/dd/yyyy hh:mm:ss tt - 98, 79 + 129, 92 - 190, 22 + 235, 26 5 @@ -697,7 +697,7 @@ NoControl - 152, 50 + 200, 58 102, 23 @@ -727,10 +727,10 @@ NoControl - 10, 77 + 10, 92 - 80, 24 + 93, 24 4 @@ -754,10 +754,10 @@ NoControl - 10, 21 + 10, 25 - 138, 24 + 158, 24 0 @@ -781,10 +781,10 @@ NoControl - 332, 64 + 445, 92 - 190, 24 + 223, 24 8 @@ -808,10 +808,10 @@ NoControl - 10, 49 + 10, 57 - 88, 24 + 113, 24 1 @@ -832,10 +832,10 @@ 8 - 8, 288 + 8, 362 - 600, 104 + 701, 128 1 @@ -859,7 +859,7 @@ True - 616, 400 + 717, 498 RecurrencePattern diff --git a/Source/EWSPDIWinForms/RecurrencePropertiesDlg.Designer.cs b/Source/EWSPDIWinForms/RecurrencePropertiesDlg.Designer.cs index 561fa60..1fa2c01 100644 --- a/Source/EWSPDIWinForms/RecurrencePropertiesDlg.Designer.cs +++ b/Source/EWSPDIWinForms/RecurrencePropertiesDlg.Designer.cs @@ -37,6 +37,7 @@ private void InitializeComponent() // resources.ApplyResources(this.rpRecurrence, "rpRecurrence"); this.rpRecurrence.Name = "rpRecurrence"; + this.rpRecurrence.ShowEndTime = false; // // btnCancel // diff --git a/Source/EWSPDIWinForms/RecurrencePropertiesDlg.cs b/Source/EWSPDIWinForms/RecurrencePropertiesDlg.cs index 6310fdf..e91ec44 100644 --- a/Source/EWSPDIWinForms/RecurrencePropertiesDlg.cs +++ b/Source/EWSPDIWinForms/RecurrencePropertiesDlg.cs @@ -2,8 +2,8 @@ // System : EWSoftware.PDI Windows Forms Controls // File : RecurrencePropertiesDlg.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 12/31/2014 -// Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +// Updated : 11/23/2018 +// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved // Compiler: Visual C# // // This is used to add or edit recurrence object information @@ -38,8 +38,8 @@ public partial class RecurrencePropertiesDlg : System.Windows.Forms.Form /// will be used in all recurrences edited by the control. public bool ShowWeekStartDay { - get { return rpRecurrence.ShowWeekStartDay; } - set { rpRecurrence.ShowWeekStartDay = value; } + get => rpRecurrence.ShowWeekStartDay; + set => rpRecurrence.ShowWeekStartDay = value; } /// @@ -50,8 +50,8 @@ public bool ShowWeekStartDay /// recurrences edited by the control. public bool ShowCanOccurOnHoliday { - get { return rpRecurrence.ShowCanOccurOnHoliday; } - set { rpRecurrence.ShowCanOccurOnHoliday = value; } + get => rpRecurrence.ShowCanOccurOnHoliday; + set => rpRecurrence.ShowCanOccurOnHoliday = value; } /// @@ -63,8 +63,8 @@ public bool ShowCanOccurOnHoliday /// to the simple options available for the currently selected frequency. public bool ShowAdvanced { - get { return rpRecurrence.ShowAdvanced; } - set { rpRecurrence.ShowAdvanced = value; } + get => rpRecurrence.ShowAdvanced; + set => rpRecurrence.ShowAdvanced = value; } /// @@ -77,8 +77,8 @@ public bool ShowAdvanced /// simple pattern for the maximum allowed pattern. public RecurFrequency MaximumPattern { - get { return rpRecurrence.MaximumPattern; } - set { rpRecurrence.MaximumPattern = value; } + get => rpRecurrence.MaximumPattern; + set => rpRecurrence.MaximumPattern = value; } /// @@ -89,8 +89,8 @@ public RecurFrequency MaximumPattern /// visible, the time value on the "End by Date" option will always be 12:00am. public bool ShowEndTime { - get { return rpRecurrence.ShowEndTime; } - set { rpRecurrence.ShowEndTime = value; } + get => rpRecurrence.ShowEndTime; + set => rpRecurrence.ShowEndTime = value; } #endregion @@ -117,7 +117,7 @@ public RecurrencePropertiesDlg() public void GetRecurrence(Recurrence recurrence) { if(recurrence == null) - throw new ArgumentNullException("recurrence", LR.GetString("ExRPRecurrenceIsNull")); + throw new ArgumentNullException(nameof(recurrence), LR.GetString("ExRPRecurrenceIsNull")); rpRecurrence.GetRecurrence(recurrence); } diff --git a/Source/EWSPDIWinForms/RecurrencePropertiesDlg.resx b/Source/EWSPDIWinForms/RecurrencePropertiesDlg.resx index ae2affa..ab85b2b 100644 --- a/Source/EWSPDIWinForms/RecurrencePropertiesDlg.resx +++ b/Source/EWSPDIWinForms/RecurrencePropertiesDlg.resx @@ -126,7 +126,7 @@ 0, 0 - 616, 355 + 730, 451 @@ -136,7 +136,7 @@ rpRecurrence - EWSoftware.PDI.Windows.Forms.RecurrencePattern, EWSoftware.PDI.Windows.Forms, Version=2014.10.14.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 + EWSoftware.PDI.Windows.Forms.RecurrencePattern, EWSoftware.PDI.Windows.Forms, Version=2018.11.17.0, Culture=neutral, PublicKeyToken=69a3299ed3c63934 $this @@ -151,10 +151,10 @@ NoControl - 518, 361 + 600, 458 - 88, 32 + 117, 41 2 @@ -181,10 +181,10 @@ NoControl - 12, 361 + 16, 458 - 88, 32 + 117, 41 1 @@ -208,10 +208,10 @@ True - 6, 15 + 8, 19 - 618, 405 + 728, 514 @@ -281,10 +281,10 @@ - 636, 760 + 750, 900 - 636, 450 + 750, 570 CenterScreen diff --git a/Source/EWSPDIWinForms/SecondlyPattern.resx b/Source/EWSPDIWinForms/SecondlyPattern.resx index cb691bd..deb12ee 100644 --- a/Source/EWSPDIWinForms/SecondlyPattern.resx +++ b/Source/EWSPDIWinForms/SecondlyPattern.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + - 110, 8 + 130, 8 - 72, 23 + 93, 23 - + 2 @@ -142,7 +142,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -151,10 +151,10 @@ 1 - 56, 9 + 63, 7 - 48, 22 + 61, 26 1 @@ -166,7 +166,7 @@ udcSeconds - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -181,7 +181,7 @@ 2, 8 - 48, 23 + 55, 23 0 @@ -196,7 +196,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -204,16 +204,16 @@ 2 - + True - 192, 40 + 232, 40 SecondlyPattern - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/EWSPDIWinForms/WeeklyPattern.resx b/Source/EWSPDIWinForms/WeeklyPattern.resx index 17cb0de..6453cef 100644 --- a/Source/EWSPDIWinForms/WeeklyPattern.resx +++ b/Source/EWSPDIWinForms/WeeklyPattern.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + - -6, 8 + 0, 10 - 97, 23 + 106, 23 - + 0 @@ -142,7 +142,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -154,7 +154,7 @@ NoControl - 151, 8 + 183, 10 76, 23 @@ -172,7 +172,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -184,10 +184,10 @@ NoControl - 6, 41 + 14, 41 - 94, 24 + 115, 24 3 @@ -199,7 +199,7 @@ chkSunday - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -211,10 +211,10 @@ NoControl - 106, 41 + 129, 41 - 86, 24 + 107, 24 4 @@ -226,7 +226,7 @@ chkMonday - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -238,10 +238,10 @@ NoControl - 198, 41 + 236, 41 - 88, 24 + 109, 24 5 @@ -253,7 +253,7 @@ chkTuesday - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -265,10 +265,10 @@ NoControl - 292, 41 + 345, 41 - 107, 24 + 128, 24 6 @@ -280,7 +280,7 @@ chkWednesday - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -292,10 +292,10 @@ NoControl - 6, 71 + 14, 71 - 94, 24 + 115, 24 7 @@ -307,7 +307,7 @@ chkThursday - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -319,10 +319,10 @@ NoControl - 106, 71 + 128, 71 - 86, 24 + 107, 24 8 @@ -334,7 +334,7 @@ chkFriday - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -346,10 +346,10 @@ NoControl - 198, 71 + 236, 71 - 88, 24 + 109, 24 9 @@ -361,7 +361,7 @@ chkSaturday - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -370,10 +370,10 @@ 1 - 97, 9 + 116, 9 - 48, 22 + 61, 26 1 @@ -385,7 +385,7 @@ udcWeeks - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -393,16 +393,16 @@ 0 - + True - 404, 104 + 480, 104 WeeklyPattern - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/EWSPDIWinForms/YearlyPattern.resx b/Source/EWSPDIWinForms/YearlyPattern.resx index 9683898..d673e27 100644 --- a/Source/EWSPDIWinForms/YearlyPattern.resx +++ b/Source/EWSPDIWinForms/YearlyPattern.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + - 281, 42 + 318, 43 25, 23 - + 9 @@ -142,7 +142,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -151,16 +151,16 @@ 12 - 16 + 20 - 158, 42 + 177, 41 12 - 120, 24 + 135, 28 8 @@ -169,7 +169,7 @@ cboDOW - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -178,16 +178,16 @@ 7 - 16 + 20 - 72, 42 + 76, 41 12 - 80, 24 + 95, 28 7 @@ -196,7 +196,7 @@ cboOccurrence - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -208,7 +208,7 @@ NoControl - 8, 41 + 6, 42 64, 24 @@ -223,7 +223,7 @@ rbDayOfWeek - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -235,7 +235,7 @@ NoControl - 8, 8 + 6, 8 78, 24 @@ -250,7 +250,7 @@ rbDayXEveryYYears - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -259,16 +259,16 @@ 10 - 16 + 20 - 305, 42 + 348, 41 12 - 104, 24 + 120, 28 10 @@ -277,7 +277,7 @@ cboDOWMonth - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -286,16 +286,16 @@ 6 - 16 + 20 - 72, 9 + 90, 7 12 - 104, 24 + 120, 28 2 @@ -304,7 +304,7 @@ cboMonth - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -316,7 +316,7 @@ NoControl - 335, 10 + 404, 9 64, 23 @@ -334,7 +334,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -346,7 +346,7 @@ NoControl - 236, 10 + 283, 9 48, 23 @@ -364,7 +364,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -376,7 +376,7 @@ NoControl - 126, 73 + 152, 76 64, 23 @@ -394,7 +394,7 @@ label3 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -406,7 +406,7 @@ NoControl - 26, 73 + 31, 76 48, 23 @@ -424,7 +424,7 @@ label5 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -433,10 +433,10 @@ 13 - 182, 11 + 216, 8 - 48, 22 + 61, 26 3 @@ -448,7 +448,7 @@ udcDay - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -457,10 +457,10 @@ 2 - 281, 11 + 337, 8 - 48, 22 + 61, 26 5 @@ -472,7 +472,7 @@ udcYears - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -481,10 +481,10 @@ 1 - 72, 74 + 85, 75 - 48, 22 + 61, 26 12 @@ -496,7 +496,7 @@ udcDOWYears - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -504,16 +504,16 @@ 0 - + True - 418, 104 + 513, 108 YearlyPattern - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Source/PDIWebDemo.sln b/Source/PDIWebDemo.sln index ea943f6..d076af9 100644 --- a/Source/PDIWebDemo.sln +++ b/Source/PDIWebDemo.sln @@ -54,6 +54,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A883170-D3A8-4356-A405-1755B7DA5E4F}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + Common.vsspell = Common.vsspell PDIWebDemo.sln.vsspell = PDIWebDemo.sln.vsspell EndProjectSection EndProject diff --git a/Source/PDIWebDemo.sln.vsspell b/Source/PDIWebDemo.sln.vsspell index 81f3cf8..bc2788d 100644 --- a/Source/PDIWebDemo.sln.vsspell +++ b/Source/PDIWebDemo.sln.vsspell @@ -1,14 +1,14 @@  - + True True - True - - .vcf - .ics - True + True + Common.vsspell + True + + True \ No newline at end of file diff --git a/Source/VBNetDemos.sln b/Source/VBNetDemos.sln index 5f4a64e..f825746 100644 --- a/Source/VBNetDemos.sln +++ b/Source/VBNetDemos.sln @@ -11,7 +11,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8E4FCD09-D7DE-448A-B2DD-DE5168D6A54B}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + Common.vsspell = Common.vsspell EWSPDIDemos.ruleset = EWSPDIDemos.ruleset + VBNetDemos.sln.vsspell = VBNetDemos.sln.vsspell EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EWSoftware.PDI", "EWSPDI\EWSoftware.PDI.csproj", "{E4BE35A2-31C3-4BE1-A257-413FB78CDD9B}" diff --git a/Source/VBNetDemos.sln.vsspell b/Source/VBNetDemos.sln.vsspell new file mode 100644 index 0000000..bc2788d --- /dev/null +++ b/Source/VBNetDemos.sln.vsspell @@ -0,0 +1,14 @@ + + + + True + + True + True + True + Common.vsspell + True + + True + \ No newline at end of file diff --git a/Source/VBNetDemos/CalendarBrowser/AboutDlg.Designer.vb b/Source/VBNetDemos/CalendarBrowser/AboutDlg.Designer.vb index 8d9daac..dc90256 100644 --- a/Source/VBNetDemos/CalendarBrowser/AboutDlg.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/AboutDlg.Designer.vb @@ -41,9 +41,9 @@ Partial Class AboutDlg ' 'lnkHelp ' - Me.lnkHelp.Location = New System.Drawing.Point(168, 318) + Me.lnkHelp.Location = New System.Drawing.Point(187, 334) Me.lnkHelp.Name = "lnkHelp" - Me.lnkHelp.Size = New System.Drawing.Size(144, 18) + Me.lnkHelp.Size = New System.Drawing.Size(216, 23) Me.lnkHelp.TabIndex = 6 Me.lnkHelp.TabStop = true Me.lnkHelp.Text = "Eric@EWoodruff.us" @@ -51,22 +51,22 @@ Partial Class AboutDlg 'ColumnHeader1 ' Me.ColumnHeader1.Text = "Name" - Me.ColumnHeader1.Width = 250 + Me.ColumnHeader1.Width = 275 ' 'btnSysInfo ' - Me.btnSysInfo.Location = New System.Drawing.Point(334, 366) + Me.btnSysInfo.Location = New System.Drawing.Point(355, 398) Me.btnSysInfo.Name = "btnSysInfo" - Me.btnSysInfo.Size = New System.Drawing.Size(112, 32) + Me.btnSysInfo.Size = New System.Drawing.Size(150, 32) Me.btnSysInfo.TabIndex = 9 Me.btnSysInfo.Text = "System Info..." ' 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(216, 366) + Me.btnOK.Location = New System.Drawing.Point(199, 398) Me.btnOK.Name = "btnOK" - Me.btnOK.Size = New System.Drawing.Size(112, 32) + Me.btnOK.Size = New System.Drawing.Size(150, 32) Me.btnOK.TabIndex = 8 Me.btnOK.Text = "OK" ' @@ -76,10 +76,10 @@ Partial Class AboutDlg Me.lvComponents.FullRowSelect = true Me.lvComponents.GridLines = true Me.lvComponents.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable - Me.lvComponents.Location = New System.Drawing.Point(12, 145) + Me.lvComponents.Location = New System.Drawing.Point(12, 153) Me.lvComponents.MultiSelect = false Me.lvComponents.Name = "lvComponents" - Me.lvComponents.Size = New System.Drawing.Size(434, 170) + Me.lvComponents.Size = New System.Drawing.Size(493, 170) Me.lvComponents.TabIndex = 4 Me.lvComponents.UseCompatibleStateImageBehavior = false Me.lvComponents.View = System.Windows.Forms.View.Details @@ -91,9 +91,9 @@ Partial Class AboutDlg ' 'Label1 ' - Me.Label1.Location = New System.Drawing.Point(12, 123) + Me.Label1.Location = New System.Drawing.Point(8, 127) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(164, 19) + Me.Label1.Size = New System.Drawing.Size(164, 23) Me.Label1.TabIndex = 3 Me.Label1.Text = "Product Components" ' @@ -101,23 +101,23 @@ Partial Class AboutDlg ' Me.lblName.Location = New System.Drawing.Point(80, 8) Me.lblName.Name = "lblName" - Me.lblName.Size = New System.Drawing.Size(366, 19) + Me.lblName.Size = New System.Drawing.Size(425, 23) Me.lblName.TabIndex = 0 Me.lblName.Text = "" ' 'lblDescription ' - Me.lblDescription.Location = New System.Drawing.Point(80, 56) + Me.lblDescription.Location = New System.Drawing.Point(80, 64) Me.lblDescription.Name = "lblDescription" - Me.lblDescription.Size = New System.Drawing.Size(366, 67) + Me.lblDescription.Size = New System.Drawing.Size(425, 67) Me.lblDescription.TabIndex = 2 Me.lblDescription.Text = "" ' 'lblCopyright ' - Me.lblCopyright.Location = New System.Drawing.Point(12, 344) + Me.lblCopyright.Location = New System.Drawing.Point(12, 364) Me.lblCopyright.Name = "lblCopyright" - Me.lblCopyright.Size = New System.Drawing.Size(434, 19) + Me.lblCopyright.Size = New System.Drawing.Size(493, 23) Me.lblCopyright.TabIndex = 7 Me.lblCopyright.Text = "" ' @@ -133,17 +133,17 @@ Partial Class AboutDlg ' 'lblVersion ' - Me.lblVersion.Location = New System.Drawing.Point(80, 32) + Me.lblVersion.Location = New System.Drawing.Point(80, 36) Me.lblVersion.Name = "lblVersion" - Me.lblVersion.Size = New System.Drawing.Size(366, 19) + Me.lblVersion.Size = New System.Drawing.Size(425, 23) Me.lblVersion.TabIndex = 1 Me.lblVersion.Text = "" ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(12, 318) + Me.label2.Location = New System.Drawing.Point(12, 334) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(162, 19) + Me.label2.Size = New System.Drawing.Size(178, 23) Me.label2.TabIndex = 5 Me.label2.Text = "For help send e-mail to" ' @@ -151,7 +151,7 @@ Partial Class AboutDlg ' Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnOK - Me.ClientSize = New System.Drawing.Size(458, 410) + Me.ClientSize = New System.Drawing.Size(517, 442) Me.Controls.Add(Me.lnkHelp) Me.Controls.Add(Me.label2) Me.Controls.Add(Me.btnSysInfo) diff --git a/Source/VBNetDemos/CalendarBrowser/AboutDlg.vb b/Source/VBNetDemos/CalendarBrowser/AboutDlg.vb index 4ba1df1..9997862 100644 --- a/Source/VBNetDemos/CalendarBrowser/AboutDlg.vb +++ b/Source/VBNetDemos/CalendarBrowser/AboutDlg.vb @@ -1,8 +1,8 @@ '================================================================================================================ ' File : AboutDlg.vb ' Author : Eric Woodruff -' Updated : 01/02/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This form is used to display application version information @@ -17,6 +17,8 @@ ' 12/03/2004 EFW Created the code '================================================================================================================ +' Ignore Spelling: mailto + Imports System.Reflection Public Partial Class AboutDlg @@ -69,8 +71,8 @@ Public Partial Class AboutDlg End Try End Sub - Private Sub lnkHelp_LinkClicked(ByVal sender As System.Object, _ - ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles lnkHelp.LinkClicked + Private Sub lnkHelp_LinkClicked(ByVal sender As System.Object, + ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles lnkHelp.LinkClicked Try ' Launch the e-mail URL, this will fail if user does not have an association for e-mail URLs System.Diagnostics.Process.Start(DirectCast(e.Link.LinkData, String)) diff --git a/Source/VBNetDemos/CalendarBrowser/AlarmControl.Designer.vb b/Source/VBNetDemos/CalendarBrowser/AlarmControl.Designer.vb index 3de80b9..840d4e9 100644 --- a/Source/VBNetDemos/CalendarBrowser/AlarmControl.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/AlarmControl.Designer.vb @@ -57,10 +57,10 @@ Partial Class AlarmControl Me.tabInfo.Controls.Add(Me.pgGeneral) Me.tabInfo.Controls.Add(Me.pgAttendees) Me.tabInfo.Controls.Add(Me.pgAttachments) - Me.tabInfo.Location = New System.Drawing.Point(8, 8) + Me.tabInfo.Location = New System.Drawing.Point(3, 3) Me.tabInfo.Name = "tabInfo" Me.tabInfo.SelectedIndex = 0 - Me.tabInfo.Size = New System.Drawing.Size(562, 272) + Me.tabInfo.Size = New System.Drawing.Size(660, 308) Me.tabInfo.TabIndex = 0 ' 'pgGeneral @@ -82,18 +82,18 @@ Partial Class AlarmControl Me.pgGeneral.Controls.Add(Me.label4) Me.pgGeneral.Controls.Add(Me.cboAction) Me.pgGeneral.Controls.Add(Me.label10) - Me.pgGeneral.Location = New System.Drawing.Point(4, 25) + Me.pgGeneral.Location = New System.Drawing.Point(4, 29) Me.pgGeneral.Name = "pgGeneral" - Me.pgGeneral.Size = New System.Drawing.Size(554, 243) + Me.pgGeneral.Size = New System.Drawing.Size(652, 275) Me.pgGeneral.TabIndex = 0 Me.pgGeneral.Text = "General" Me.pgGeneral.UseVisualStyleBackColor = true ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(20, 72) + Me.label3.Location = New System.Drawing.Point(20, 93) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(104, 23) + Me.label3.Size = New System.Drawing.Size(127, 23) Me.label3.TabIndex = 16 Me.label3.Text = "or Date/Time" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -101,48 +101,48 @@ Partial Class AlarmControl 'txtDescription ' Me.txtDescription.AcceptsReturn = true - Me.txtDescription.Location = New System.Drawing.Point(130, 168) + Me.txtDescription.Location = New System.Drawing.Point(153, 195) Me.txtDescription.Multiline = true Me.txtDescription.Name = "txtDescription" Me.txtDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtDescription.Size = New System.Drawing.Size(384, 64) + Me.txtDescription.Size = New System.Drawing.Size(457, 64) Me.txtDescription.TabIndex = 15 ' 'label11 ' - Me.label11.Location = New System.Drawing.Point(25, 168) + Me.label11.Location = New System.Drawing.Point(25, 197) Me.label11.Name = "label11" - Me.label11.Size = New System.Drawing.Size(99, 23) + Me.label11.Size = New System.Drawing.Size(122, 23) Me.label11.TabIndex = 14 Me.label11.Text = "Description" Me.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtSummary ' - Me.txtSummary.Location = New System.Drawing.Point(130, 136) + Me.txtSummary.Location = New System.Drawing.Point(153, 161) Me.txtSummary.Name = "txtSummary" - Me.txtSummary.Size = New System.Drawing.Size(384, 22) + Me.txtSummary.Size = New System.Drawing.Size(457, 26) Me.txtSummary.TabIndex = 13 ' 'label8 ' - Me.label8.Location = New System.Drawing.Point(38, 136) + Me.label8.Location = New System.Drawing.Point(29, 163) Me.label8.Name = "label8" - Me.label8.Size = New System.Drawing.Size(86, 23) + Me.label8.Size = New System.Drawing.Size(118, 23) Me.label8.TabIndex = 12 Me.label8.Text = "Summary" Me.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtDuration ' - Me.txtDuration.Location = New System.Drawing.Point(284, 103) + Me.txtDuration.Location = New System.Drawing.Point(345, 126) Me.txtDuration.Name = "txtDuration" - Me.txtDuration.Size = New System.Drawing.Size(108, 22) + Me.txtDuration.Size = New System.Drawing.Size(192, 26) Me.txtDuration.TabIndex = 11 ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(202, 103) + Me.label2.Location = New System.Drawing.Point(263, 128) Me.label2.Name = "label2" Me.label2.Size = New System.Drawing.Size(76, 23) Me.label2.TabIndex = 10 @@ -151,35 +151,35 @@ Partial Class AlarmControl ' 'label15 ' - Me.label15.Location = New System.Drawing.Point(47, 103) + Me.label15.Location = New System.Drawing.Point(33, 128) Me.label15.Name = "label15" - Me.label15.Size = New System.Drawing.Size(77, 23) + Me.label15.Size = New System.Drawing.Size(114, 23) Me.label15.TabIndex = 7 Me.label15.Text = "Repeat" Me.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'udcRepeat ' - Me.udcRepeat.Location = New System.Drawing.Point(130, 104) + Me.udcRepeat.Location = New System.Drawing.Point(153, 127) Me.udcRepeat.Maximum = New Decimal(New Integer() {32767, 0, 0, 0}) Me.udcRepeat.Name = "udcRepeat" - Me.udcRepeat.Size = New System.Drawing.Size(64, 22) + Me.udcRepeat.Size = New System.Drawing.Size(85, 26) Me.udcRepeat.TabIndex = 8 Me.udcRepeat.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'chkFromEnd ' - Me.chkFromEnd.Location = New System.Drawing.Point(248, 40) + Me.chkFromEnd.Location = New System.Drawing.Point(289, 61) Me.chkFromEnd.Name = "chkFromEnd" - Me.chkFromEnd.Size = New System.Drawing.Size(280, 24) + Me.chkFromEnd.Size = New System.Drawing.Size(350, 24) Me.chkFromEnd.TabIndex = 9 Me.chkFromEnd.Text = "Duration Trigger is relative to end time" ' 'txtTrigger ' - Me.txtTrigger.Location = New System.Drawing.Point(130, 40) + Me.txtTrigger.Location = New System.Drawing.Point(153, 59) Me.txtTrigger.Name = "txtTrigger" - Me.txtTrigger.Size = New System.Drawing.Size(108, 22) + Me.txtTrigger.Size = New System.Drawing.Size(108, 26) Me.txtTrigger.TabIndex = 5 ' 'dtpTrigger @@ -187,17 +187,17 @@ Partial Class AlarmControl Me.dtpTrigger.Checked = false Me.dtpTrigger.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpTrigger.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpTrigger.Location = New System.Drawing.Point(130, 72) + Me.dtpTrigger.Location = New System.Drawing.Point(153, 93) Me.dtpTrigger.Name = "dtpTrigger" Me.dtpTrigger.ShowCheckBox = true - Me.dtpTrigger.Size = New System.Drawing.Size(210, 22) + Me.dtpTrigger.Size = New System.Drawing.Size(255, 26) Me.dtpTrigger.TabIndex = 6 ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(5, 40) + Me.label1.Location = New System.Drawing.Point(3, 61) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(119, 23) + Me.label1.Size = New System.Drawing.Size(144, 23) Me.label1.TabIndex = 4 Me.label1.Text = "Duration Trigger" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -205,16 +205,16 @@ Partial Class AlarmControl 'txtOtherAction ' Me.txtOtherAction.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper - Me.txtOtherAction.Location = New System.Drawing.Point(346, 8) + Me.txtOtherAction.Location = New System.Drawing.Point(411, 23) Me.txtOtherAction.Name = "txtOtherAction" - Me.txtOtherAction.Size = New System.Drawing.Size(136, 22) + Me.txtOtherAction.Size = New System.Drawing.Size(192, 26) Me.txtOtherAction.TabIndex = 3 ' 'label4 ' - Me.label4.Location = New System.Drawing.Point(250, 8) + Me.label4.Location = New System.Drawing.Point(285, 25) Me.label4.Name = "label4" - Me.label4.Size = New System.Drawing.Size(90, 23) + Me.label4.Size = New System.Drawing.Size(120, 23) Me.label4.TabIndex = 2 Me.label4.Text = "Other Action" Me.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -223,16 +223,16 @@ Partial Class AlarmControl ' Me.cboAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboAction.Items.AddRange(New Object() {"Audio", "Display", "E-Mail", "Procedure", "Other"}) - Me.cboAction.Location = New System.Drawing.Point(130, 8) + Me.cboAction.Location = New System.Drawing.Point(153, 23) Me.cboAction.Name = "cboAction" - Me.cboAction.Size = New System.Drawing.Size(112, 24) + Me.cboAction.Size = New System.Drawing.Size(112, 28) Me.cboAction.TabIndex = 1 ' 'label10 ' - Me.label10.Location = New System.Drawing.Point(63, 8) + Me.label10.Location = New System.Drawing.Point(33, 25) Me.label10.Name = "label10" - Me.label10.Size = New System.Drawing.Size(61, 23) + Me.label10.Size = New System.Drawing.Size(114, 23) Me.label10.TabIndex = 0 Me.label10.Text = "Action" Me.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -240,42 +240,43 @@ Partial Class AlarmControl 'pgAttendees ' Me.pgAttendees.Controls.Add(Me.ucAttendees) - Me.pgAttendees.Location = New System.Drawing.Point(4, 25) + Me.pgAttendees.Location = New System.Drawing.Point(4, 29) Me.pgAttendees.Name = "pgAttendees" - Me.pgAttendees.Size = New System.Drawing.Size(554, 243) + Me.pgAttendees.Size = New System.Drawing.Size(652, 275) Me.pgAttendees.TabIndex = 1 Me.pgAttendees.Text = "Attendees" Me.pgAttendees.UseVisualStyleBackColor = true ' 'ucAttendees ' - Me.ucAttendees.Location = New System.Drawing.Point(22, 17) + Me.ucAttendees.Location = New System.Drawing.Point(26, 18) Me.ucAttendees.Name = "ucAttendees" - Me.ucAttendees.Size = New System.Drawing.Size(510, 208) + Me.ucAttendees.Size = New System.Drawing.Size(594, 234) Me.ucAttendees.TabIndex = 0 ' 'pgAttachments ' Me.pgAttachments.Controls.Add(Me.ucAttachments) - Me.pgAttachments.Location = New System.Drawing.Point(4, 25) + Me.pgAttachments.Location = New System.Drawing.Point(4, 29) Me.pgAttachments.Name = "pgAttachments" - Me.pgAttachments.Size = New System.Drawing.Size(554, 243) + Me.pgAttachments.Size = New System.Drawing.Size(652, 275) Me.pgAttachments.TabIndex = 2 Me.pgAttachments.Text = "Attachments" Me.pgAttachments.UseVisualStyleBackColor = true ' 'ucAttachments ' - Me.ucAttachments.Location = New System.Drawing.Point(6, 8) + Me.ucAttachments.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucAttachments.Location = New System.Drawing.Point(0, 0) Me.ucAttachments.Name = "ucAttachments" - Me.ucAttachments.Size = New System.Drawing.Size(543, 226) + Me.ucAttachments.Size = New System.Drawing.Size(652, 275) Me.ucAttachments.TabIndex = 0 ' 'AlarmControl ' Me.Controls.Add(Me.tabInfo) Me.Name = "AlarmControl" - Me.Size = New System.Drawing.Size(584, 312) + Me.Size = New System.Drawing.Size(666, 342) Me.Controls.SetChildIndex(Me.tabInfo, 0) Me.tabInfo.ResumeLayout(false) Me.pgGeneral.ResumeLayout(false) diff --git a/Source/VBNetDemos/CalendarBrowser/AlarmControl.vb b/Source/VBNetDemos/CalendarBrowser/AlarmControl.vb index 3b2d45a..562fee1 100644 --- a/Source/VBNetDemos/CalendarBrowser/AlarmControl.vb +++ b/Source/VBNetDemos/CalendarBrowser/AlarmControl.vb @@ -19,7 +19,6 @@ ' 05/22/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System Imports System.ComponentModel Imports System.Globalization Imports System.Windows.Forms @@ -27,7 +26,6 @@ Imports System.Windows.Forms Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms Public Partial Class AlarmControl Inherits EWSoftware.PDI.Windows.Forms.BrowseControl diff --git a/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.Designer.vb b/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.Designer.vb index 2474f0b..6c7b7c9 100644 --- a/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.Designer.vb @@ -37,32 +37,32 @@ Partial Class AttachmentsControl ' 'chkInline ' - Me.chkInline.Location = New System.Drawing.Point(394, 8) + Me.chkInline.Location = New System.Drawing.Point(442, 10) Me.chkInline.Name = "chkInline" - Me.chkInline.Size = New System.Drawing.Size(130, 24) + Me.chkInline.Size = New System.Drawing.Size(160, 24) Me.chkInline.TabIndex = 3 Me.chkInline.Text = "Store file inline" ' 'btnLoad ' - Me.btnLoad.Location = New System.Drawing.Point(354, 7) + Me.btnLoad.Location = New System.Drawing.Point(385, 7) Me.btnLoad.Name = "btnLoad" - Me.btnLoad.Size = New System.Drawing.Size(28, 23) + Me.btnLoad.Size = New System.Drawing.Size(35, 28) Me.btnLoad.TabIndex = 2 Me.btnLoad.Text = "..." ' 'txtFilename ' - Me.txtFilename.Location = New System.Drawing.Point(74, 8) + Me.txtFilename.Location = New System.Drawing.Point(101, 8) Me.txtFilename.Name = "txtFilename" - Me.txtFilename.Size = New System.Drawing.Size(280, 22) + Me.txtFilename.Size = New System.Drawing.Size(280, 26) Me.txtFilename.TabIndex = 1 ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(10, 8) + Me.label1.Location = New System.Drawing.Point(19, 10) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(58, 23) + Me.label1.Size = New System.Drawing.Size(76, 23) Me.label1.TabIndex = 0 Me.label1.Text = "Name" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -71,9 +71,9 @@ Partial Class AttachmentsControl ' Me.btnDetach.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.btnDetach.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnDetach.Location = New System.Drawing.Point(251, 170) + Me.btnDetach.Location = New System.Drawing.Point(285, 260) Me.btnDetach.Name = "btnDetach" - Me.btnDetach.Size = New System.Drawing.Size(75, 28) + Me.btnDetach.Size = New System.Drawing.Size(88, 32) Me.btnDetach.TabIndex = 10 Me.btnDetach.Text = "Detach" ' @@ -81,9 +81,9 @@ Partial Class AttachmentsControl ' Me.btnClear.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClear.Location = New System.Drawing.Point(170, 170) + Me.btnClear.Location = New System.Drawing.Point(191, 260) Me.btnClear.Name = "btnClear" - Me.btnClear.Size = New System.Drawing.Size(75, 28) + Me.btnClear.Size = New System.Drawing.Size(88, 32) Me.btnClear.TabIndex = 9 Me.btnClear.Text = "Clear" ' @@ -91,9 +91,9 @@ Partial Class AttachmentsControl ' Me.btnRemove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.btnRemove.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnRemove.Location = New System.Drawing.Point(89, 170) + Me.btnRemove.Location = New System.Drawing.Point(97, 260) Me.btnRemove.Name = "btnRemove" - Me.btnRemove.Size = New System.Drawing.Size(75, 28) + Me.btnRemove.Size = New System.Drawing.Size(88, 32) Me.btnRemove.TabIndex = 8 Me.btnRemove.Text = "Remove" ' @@ -101,9 +101,9 @@ Partial Class AttachmentsControl ' Me.btnAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAdd.Location = New System.Drawing.Point(8, 170) + Me.btnAdd.Location = New System.Drawing.Point(3, 260) Me.btnAdd.Name = "btnAdd" - Me.btnAdd.Size = New System.Drawing.Size(75, 28) + Me.btnAdd.Size = New System.Drawing.Size(88, 32) Me.btnAdd.TabIndex = 7 Me.btnAdd.Text = "Add" ' @@ -114,24 +114,25 @@ Partial Class AttachmentsControl Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.lbAttachments.HorizontalExtent = 800 Me.lbAttachments.HorizontalScrollbar = true - Me.lbAttachments.ItemHeight = 16 - Me.lbAttachments.Location = New System.Drawing.Point(8, 64) + Me.lbAttachments.IntegralHeight = false + Me.lbAttachments.ItemHeight = 20 + Me.lbAttachments.Location = New System.Drawing.Point(3, 72) Me.lbAttachments.Name = "lbAttachments" - Me.lbAttachments.Size = New System.Drawing.Size(522, 100) + Me.lbAttachments.Size = New System.Drawing.Size(623, 182) Me.lbAttachments.TabIndex = 6 ' 'txtFormat ' - Me.txtFormat.Location = New System.Drawing.Point(74, 36) + Me.txtFormat.Location = New System.Drawing.Point(101, 40) Me.txtFormat.Name = "txtFormat" - Me.txtFormat.Size = New System.Drawing.Size(280, 22) + Me.txtFormat.Size = New System.Drawing.Size(280, 26) Me.txtFormat.TabIndex = 5 ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(10, 36) + Me.label2.Location = New System.Drawing.Point(8, 42) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(58, 23) + Me.label2.Size = New System.Drawing.Size(87, 23) Me.label2.TabIndex = 4 Me.label2.Text = "Format" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -150,7 +151,7 @@ Partial Class AttachmentsControl Me.Controls.Add(Me.txtFilename) Me.Controls.Add(Me.label1) Me.Name = "AttachmentsControl" - Me.Size = New System.Drawing.Size(538, 202) + Me.Size = New System.Drawing.Size(629, 295) Me.ResumeLayout(false) Me.PerformLayout diff --git a/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.vb b/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.vb index cc1ef31..3e3c08b 100644 --- a/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.vb +++ b/Source/VBNetDemos/CalendarBrowser/AttachmentsControl.vb @@ -19,13 +19,8 @@ ' 05/22/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System -Imports System.ComponentModel -Imports System.Drawing Imports System.IO -Imports System.Windows.Forms -Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Properties ''' diff --git a/Source/VBNetDemos/CalendarBrowser/AttendeeControl.Designer.vb b/Source/VBNetDemos/CalendarBrowser/AttendeeControl.Designer.vb index 6475e45..e28c1ee 100644 --- a/Source/VBNetDemos/CalendarBrowser/AttendeeControl.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/AttendeeControl.Designer.vb @@ -57,46 +57,46 @@ Partial Class AttendeeControl Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(496, 173) + Me.pnlControls.Size = New System.Drawing.Size(571, 190) Me.pnlControls.TabIndex = 0 ' 'txtSentBy ' - Me.txtSentBy.Location = New System.Drawing.Point(128, 107) + Me.txtSentBy.Location = New System.Drawing.Point(153, 109) Me.txtSentBy.Name = "txtSentBy" - Me.txtSentBy.Size = New System.Drawing.Size(248, 22) + Me.txtSentBy.Size = New System.Drawing.Size(383, 26) Me.txtSentBy.TabIndex = 9 ' 'label6 ' - Me.label6.Location = New System.Drawing.Point(58, 107) + Me.label6.Location = New System.Drawing.Point(62, 111) Me.label6.Name = "label6" - Me.label6.Size = New System.Drawing.Size(64, 23) + Me.label6.Size = New System.Drawing.Size(85, 23) Me.label6.TabIndex = 8 Me.label6.Text = "Sent By" Me.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtAttendee ' - Me.txtAttendee.Location = New System.Drawing.Point(128, 11) + Me.txtAttendee.Location = New System.Drawing.Point(153, 11) Me.txtAttendee.Name = "txtAttendee" - Me.txtAttendee.Size = New System.Drawing.Size(248, 22) + Me.txtAttendee.Size = New System.Drawing.Size(383, 26) Me.txtAttendee.TabIndex = 1 ' 'label4 ' - Me.label4.Location = New System.Drawing.Point(50, 11) + Me.label4.Location = New System.Drawing.Point(62, 13) Me.label4.Name = "label4" - Me.label4.Size = New System.Drawing.Size(72, 23) + Me.label4.Size = New System.Drawing.Size(85, 23) Me.label4.TabIndex = 0 Me.label4.Text = "Attendee" Me.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'chkRSVP ' - Me.chkRSVP.Location = New System.Drawing.Point(328, 139) + Me.chkRSVP.Location = New System.Drawing.Point(353, 143) Me.chkRSVP.Name = "chkRSVP" - Me.chkRSVP.Size = New System.Drawing.Size(72, 24) + Me.chkRSVP.Size = New System.Drawing.Size(118, 24) Me.chkRSVP.TabIndex = 12 Me.chkRSVP.Text = "RSVP" ' @@ -104,17 +104,17 @@ Partial Class AttendeeControl ' Me.cboRole.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboRole.Items.AddRange(New Object() {"", "CHAIR", "REQ-PARTICIPANT", "OPT-PARTICIPANT", "NON-PARTICIPANT"}) - Me.cboRole.Location = New System.Drawing.Point(328, 75) + Me.cboRole.Location = New System.Drawing.Point(353, 75) Me.cboRole.MaxDropDownItems = 16 Me.cboRole.Name = "cboRole" - Me.cboRole.Size = New System.Drawing.Size(160, 24) + Me.cboRole.Size = New System.Drawing.Size(183, 28) Me.cboRole.TabIndex = 7 ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(276, 75) + Me.label3.Location = New System.Drawing.Point(287, 77) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(46, 23) + Me.label3.Size = New System.Drawing.Size(60, 23) Me.label3.TabIndex = 6 Me.label3.Text = "Role" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -123,33 +123,33 @@ Partial Class AttendeeControl ' Me.cboStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboStatus.Items.AddRange(New Object() {"", "NEEDS-ACTION", "ACCEPTED", "DECLINED", "TENTATIVE", "DELEGATED", "COMPLETED", "IN-PROCESS"}) - Me.cboStatus.Location = New System.Drawing.Point(128, 139) + Me.cboStatus.Location = New System.Drawing.Point(153, 141) Me.cboStatus.MaxDropDownItems = 16 Me.cboStatus.Name = "cboStatus" - Me.cboStatus.Size = New System.Drawing.Size(176, 24) + Me.cboStatus.Size = New System.Drawing.Size(176, 28) Me.cboStatus.TabIndex = 11 ' 'label10 ' - Me.label10.Location = New System.Drawing.Point(63, 139) + Me.label10.Location = New System.Drawing.Point(58, 143) Me.label10.Name = "label10" - Me.label10.Size = New System.Drawing.Size(59, 23) + Me.label10.Size = New System.Drawing.Size(89, 23) Me.label10.TabIndex = 10 Me.label10.Text = "Status" Me.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtCommonName ' - Me.txtCommonName.Location = New System.Drawing.Point(128, 43) + Me.txtCommonName.Location = New System.Drawing.Point(153, 43) Me.txtCommonName.Name = "txtCommonName" - Me.txtCommonName.Size = New System.Drawing.Size(248, 22) + Me.txtCommonName.Size = New System.Drawing.Size(383, 26) Me.txtCommonName.TabIndex = 3 ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(8, 43) + Me.label1.Location = New System.Drawing.Point(6, 45) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(114, 23) + Me.label1.Size = New System.Drawing.Size(141, 23) Me.label1.TabIndex = 2 Me.label1.Text = "Common Name" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -157,16 +157,16 @@ Partial Class AttendeeControl 'txtUserType ' Me.txtUserType.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper - Me.txtUserType.Location = New System.Drawing.Point(128, 75) + Me.txtUserType.Location = New System.Drawing.Point(153, 75) Me.txtUserType.Name = "txtUserType" - Me.txtUserType.Size = New System.Drawing.Size(128, 22) + Me.txtUserType.Size = New System.Drawing.Size(128, 26) Me.txtUserType.TabIndex = 5 ' 'label5 ' - Me.label5.Location = New System.Drawing.Point(36, 75) + Me.label5.Location = New System.Drawing.Point(37, 77) Me.label5.Name = "label5" - Me.label5.Size = New System.Drawing.Size(86, 23) + Me.label5.Size = New System.Drawing.Size(110, 23) Me.label5.TabIndex = 4 Me.label5.Text = "User Type" Me.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -175,7 +175,7 @@ Partial Class AttendeeControl ' Me.Controls.Add(Me.pnlControls) Me.Name = "AttendeeControl" - Me.Size = New System.Drawing.Size(496, 200) + Me.Size = New System.Drawing.Size(571, 218) Me.Controls.SetChildIndex(Me.pnlControls, 0) Me.pnlControls.ResumeLayout(false) Me.pnlControls.PerformLayout diff --git a/Source/VBNetDemos/CalendarBrowser/AttendeeControl.vb b/Source/VBNetDemos/CalendarBrowser/AttendeeControl.vb index e8790ac..db22043 100644 --- a/Source/VBNetDemos/CalendarBrowser/AttendeeControl.vb +++ b/Source/VBNetDemos/CalendarBrowser/AttendeeControl.vb @@ -19,14 +19,11 @@ ' 05/22/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System +' Ignore Spelling: Rsvp + Imports System.ComponentModel -Imports System.Drawing -Imports System.Windows.Forms -Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms ''' ''' This is used to edit the Attendees property collection diff --git a/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.Designer.vb b/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.Designer.vb index 560e82f..8a7f641 100644 --- a/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.Designer.vb @@ -40,10 +40,6 @@ Partial Class CalendarBrowserForm Me.btnChgTimeZone = New System.Windows.Forms.Button() Me.lblFilename = New System.Windows.Forms.Label() Me.dgvCalendar = New System.Windows.Forms.DataGridView() - Me.tbcStartDateTime = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbcSummary = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbcOrganizer = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbcComment = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.mnuMain = New System.Windows.Forms.MenuStrip() Me.miFile = New System.Windows.Forms.ToolStripMenuItem() Me.miOpen = New System.Windows.Forms.ToolStripMenuItem() @@ -62,6 +58,10 @@ Partial Class CalendarBrowserForm Me.menuItem6 = New System.Windows.Forms.ToolStripSeparator() Me.miAbout = New System.Windows.Forms.ToolStripMenuItem() Me.miExit = New System.Windows.Forms.ToolStripMenuItem() + Me.tbcStartDateTime = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbcSummary = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbcOrganizer = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbcComment = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dgvCalendar,System.ComponentModel.ISupportInitialize).BeginInit Me.mnuMain.SuspendLayout Me.SuspendLayout @@ -96,7 +96,7 @@ Partial Class CalendarBrowserForm 'btnChgVersion ' Me.btnChgVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.btnChgVersion.Location = New System.Drawing.Point(480, 516) + Me.btnChgVersion.Location = New System.Drawing.Point(448, 516) Me.btnChgVersion.Name = "btnChgVersion" Me.btnChgVersion.Size = New System.Drawing.Size(88, 32) Me.btnChgVersion.TabIndex = 6 @@ -106,17 +106,17 @@ Partial Class CalendarBrowserForm ' Me.cboComponents.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.cboComponents.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboComponents.Location = New System.Drawing.Point(786, 521) + Me.cboComponents.Location = New System.Drawing.Point(754, 519) Me.cboComponents.Name = "cboComponents" - Me.cboComponents.Size = New System.Drawing.Size(144, 24) + Me.cboComponents.Size = New System.Drawing.Size(176, 28) Me.cboComponents.TabIndex = 9 ' 'label1 ' Me.label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.label1.Location = New System.Drawing.Point(734, 521) + Me.label1.Location = New System.Drawing.Point(679, 523) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(46, 23) + Me.label1.Size = New System.Drawing.Size(69, 23) Me.label1.TabIndex = 8 Me.label1.Text = "V&iew" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -124,7 +124,7 @@ Partial Class CalendarBrowserForm 'btnChgTimeZone ' Me.btnChgTimeZone.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.btnChgTimeZone.Location = New System.Drawing.Point(574, 516) + Me.btnChgTimeZone.Location = New System.Drawing.Point(542, 516) Me.btnChgTimeZone.Name = "btnChgTimeZone" Me.btnChgTimeZone.Size = New System.Drawing.Size(120, 32) Me.btnChgTimeZone.TabIndex = 7 @@ -137,7 +137,7 @@ Partial Class CalendarBrowserForm Me.lblFilename.BackColor = System.Drawing.SystemColors.ActiveCaption Me.lblFilename.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.lblFilename.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.lblFilename.Location = New System.Drawing.Point(12, 25) + Me.lblFilename.Location = New System.Drawing.Point(12, 28) Me.lblFilename.Name = "lblFilename" Me.lblFilename.Size = New System.Drawing.Size(918, 23) Me.lblFilename.TabIndex = 1 @@ -161,7 +161,7 @@ Partial Class CalendarBrowserForm Me.dgvCalendar.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.dgvCalendar.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvCalendar.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.tbcStartDateTime, Me.tbcSummary, Me.tbcOrganizer, Me.tbcComment}) - Me.dgvCalendar.Location = New System.Drawing.Point(12, 51) + Me.dgvCalendar.Location = New System.Drawing.Point(12, 54) Me.dgvCalendar.MultiSelect = false Me.dgvCalendar.Name = "dgvCalendar" Me.dgvCalendar.ReadOnly = true @@ -176,42 +176,10 @@ Partial Class CalendarBrowserForm Me.dgvCalendar.RowHeadersWidth = 25 Me.dgvCalendar.RowTemplate.Height = 24 Me.dgvCalendar.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvCalendar.Size = New System.Drawing.Size(918, 459) + Me.dgvCalendar.Size = New System.Drawing.Size(918, 456) Me.dgvCalendar.StandardTab = true Me.dgvCalendar.TabIndex = 2 ' - 'tbcStartDateTime - ' - Me.tbcStartDateTime.DataPropertyName = "StartDateTime" - Me.tbcStartDateTime.HeaderText = "Start Date/Time" - Me.tbcStartDateTime.Name = "tbcStartDateTime" - Me.tbcStartDateTime.ReadOnly = true - Me.tbcStartDateTime.Width = 200 - ' - 'tbcSummary - ' - Me.tbcSummary.DataPropertyName = "Summary_Value" - Me.tbcSummary.HeaderText = "Summary" - Me.tbcSummary.Name = "tbcSummary" - Me.tbcSummary.ReadOnly = true - Me.tbcSummary.Width = 500 - ' - 'tbcOrganizer - ' - Me.tbcOrganizer.DataPropertyName = "Organizer_Value" - Me.tbcOrganizer.HeaderText = "Organizer" - Me.tbcOrganizer.Name = "tbcOrganizer" - Me.tbcOrganizer.ReadOnly = true - Me.tbcOrganizer.Width = 250 - ' - 'tbcComment - ' - Me.tbcComment.DataPropertyName = "Comment_Value" - Me.tbcComment.HeaderText = "Comment" - Me.tbcComment.Name = "tbcComment" - Me.tbcComment.ReadOnly = true - Me.tbcComment.Width = 500 - ' 'mnuMain ' Me.mnuMain.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!) @@ -219,40 +187,40 @@ Partial Class CalendarBrowserForm Me.mnuMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miFile}) Me.mnuMain.Location = New System.Drawing.Point(0, 0) Me.mnuMain.Name = "mnuMain" - Me.mnuMain.Size = New System.Drawing.Size(942, 25) + Me.mnuMain.Size = New System.Drawing.Size(942, 28) Me.mnuMain.TabIndex = 0 ' 'miFile ' Me.miFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miOpen, Me.miSave, Me.menuItem2, Me.miFileEncoding, Me.miPropEncoding, Me.menuItem4, Me.miClear, Me.menuItem6, Me.miAbout, Me.miExit}) Me.miFile.Name = "miFile" - Me.miFile.Size = New System.Drawing.Size(42, 21) + Me.miFile.Size = New System.Drawing.Size(46, 24) Me.miFile.Text = "&File" ' 'miOpen ' Me.miOpen.Name = "miOpen" Me.miOpen.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O),System.Windows.Forms.Keys) - Me.miOpen.Size = New System.Drawing.Size(229, 22) + Me.miOpen.Size = New System.Drawing.Size(263, 30) Me.miOpen.Text = "&Open" ' 'miSave ' Me.miSave.Name = "miSave" Me.miSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S),System.Windows.Forms.Keys) - Me.miSave.Size = New System.Drawing.Size(229, 22) + Me.miSave.Size = New System.Drawing.Size(263, 30) Me.miSave.Text = "&Save" ' 'menuItem2 ' Me.menuItem2.Name = "menuItem2" - Me.menuItem2.Size = New System.Drawing.Size(226, 6) + Me.menuItem2.Size = New System.Drawing.Size(260, 6) ' 'miFileEncoding ' Me.miFileEncoding.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miFileUnicode, Me.miFileWestEuro, Me.miFileASCII}) Me.miFileEncoding.Name = "miFileEncoding" - Me.miFileEncoding.Size = New System.Drawing.Size(229, 22) + Me.miFileEncoding.Size = New System.Drawing.Size(263, 30) Me.miFileEncoding.Text = "File Encoding" ' 'miFileUnicode @@ -260,38 +228,38 @@ Partial Class CalendarBrowserForm Me.miFileUnicode.Checked = true Me.miFileUnicode.CheckState = System.Windows.Forms.CheckState.Checked Me.miFileUnicode.Name = "miFileUnicode" - Me.miFileUnicode.Size = New System.Drawing.Size(265, 26) + Me.miFileUnicode.Size = New System.Drawing.Size(302, 30) Me.miFileUnicode.Text = "Unicode (UTF-8)" ' 'miFileWestEuro ' Me.miFileWestEuro.Name = "miFileWestEuro" - Me.miFileWestEuro.Size = New System.Drawing.Size(265, 26) + Me.miFileWestEuro.Size = New System.Drawing.Size(302, 30) Me.miFileWestEuro.Text = "Western European (Windows)" ' 'miFileASCII ' Me.miFileASCII.Name = "miFileASCII" - Me.miFileASCII.Size = New System.Drawing.Size(265, 26) + Me.miFileASCII.Size = New System.Drawing.Size(302, 30) Me.miFileASCII.Text = "ASCII" ' 'miPropEncoding ' Me.miPropEncoding.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miPropUnicode, Me.miPropWestEuro, Me.miPropASCII}) Me.miPropEncoding.Name = "miPropEncoding" - Me.miPropEncoding.Size = New System.Drawing.Size(229, 22) + Me.miPropEncoding.Size = New System.Drawing.Size(263, 30) Me.miPropEncoding.Text = "Property Encoding" ' 'miPropUnicode ' Me.miPropUnicode.Name = "miPropUnicode" - Me.miPropUnicode.Size = New System.Drawing.Size(265, 26) + Me.miPropUnicode.Size = New System.Drawing.Size(302, 30) Me.miPropUnicode.Text = "Unicode (UTF-8)" ' 'miPropWestEuro ' Me.miPropWestEuro.Name = "miPropWestEuro" - Me.miPropWestEuro.Size = New System.Drawing.Size(265, 26) + Me.miPropWestEuro.Size = New System.Drawing.Size(302, 30) Me.miPropWestEuro.Text = "Western European (Windows)" ' 'miPropASCII @@ -299,37 +267,69 @@ Partial Class CalendarBrowserForm Me.miPropASCII.Checked = true Me.miPropASCII.CheckState = System.Windows.Forms.CheckState.Checked Me.miPropASCII.Name = "miPropASCII" - Me.miPropASCII.Size = New System.Drawing.Size(265, 26) + Me.miPropASCII.Size = New System.Drawing.Size(302, 30) Me.miPropASCII.Text = "ASCII" ' 'menuItem4 ' Me.menuItem4.Name = "menuItem4" - Me.menuItem4.Size = New System.Drawing.Size(226, 6) + Me.menuItem4.Size = New System.Drawing.Size(260, 6) ' 'miClear ' Me.miClear.Name = "miClear" - Me.miClear.Size = New System.Drawing.Size(229, 22) + Me.miClear.Size = New System.Drawing.Size(263, 30) Me.miClear.Text = "&Clear" ' 'menuItem6 ' Me.menuItem6.Name = "menuItem6" - Me.menuItem6.Size = New System.Drawing.Size(226, 6) + Me.menuItem6.Size = New System.Drawing.Size(260, 6) ' 'miAbout ' Me.miAbout.Name = "miAbout" - Me.miAbout.Size = New System.Drawing.Size(229, 22) + Me.miAbout.Size = New System.Drawing.Size(263, 30) Me.miAbout.Text = "&About Calendar Browser" ' 'miExit ' Me.miExit.Name = "miExit" - Me.miExit.Size = New System.Drawing.Size(229, 22) + Me.miExit.Size = New System.Drawing.Size(263, 30) Me.miExit.Text = "E&xit" ' + 'tbcStartDateTime + ' + Me.tbcStartDateTime.DataPropertyName = "StartDateTime" + Me.tbcStartDateTime.HeaderText = "Start Date/Time" + Me.tbcStartDateTime.Name = "tbcStartDateTime" + Me.tbcStartDateTime.ReadOnly = true + Me.tbcStartDateTime.Width = 210 + ' + 'tbcSummary + ' + Me.tbcSummary.DataPropertyName = "Summary_Value" + Me.tbcSummary.HeaderText = "Summary" + Me.tbcSummary.Name = "tbcSummary" + Me.tbcSummary.ReadOnly = true + Me.tbcSummary.Width = 500 + ' + 'tbcOrganizer + ' + Me.tbcOrganizer.DataPropertyName = "Organizer_Value" + Me.tbcOrganizer.HeaderText = "Organizer" + Me.tbcOrganizer.Name = "tbcOrganizer" + Me.tbcOrganizer.ReadOnly = true + Me.tbcOrganizer.Width = 250 + ' + 'tbcComment + ' + Me.tbcComment.DataPropertyName = "Comment_Value" + Me.tbcComment.HeaderText = "Comment" + Me.tbcComment.Name = "tbcComment" + Me.tbcComment.ReadOnly = true + Me.tbcComment.Width = 500 + ' 'CalendarBrowserForm ' Me.ClientSize = New System.Drawing.Size(942, 560) @@ -344,6 +344,7 @@ Partial Class CalendarBrowserForm Me.Controls.Add(Me.btnEdit) Me.Controls.Add(Me.btnAdd) Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) + Me.MainMenuStrip = Me.mnuMain Me.MinimumSize = New System.Drawing.Size(800, 250) Me.Name = "CalendarBrowserForm" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show @@ -365,10 +366,6 @@ End Sub Friend WithEvents btnChgVersion As System.Windows.Forms.Button Private WithEvents lblFilename As System.Windows.Forms.Label Private WithEvents dgvCalendar As System.Windows.Forms.DataGridView - Private WithEvents tbcStartDateTime As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcSummary As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcOrganizer As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcComment As System.Windows.Forms.DataGridViewTextBoxColumn Private WithEvents mnuMain As System.Windows.Forms.MenuStrip Private WithEvents miFile As System.Windows.Forms.ToolStripMenuItem Private WithEvents miOpen As System.Windows.Forms.ToolStripMenuItem @@ -388,4 +385,8 @@ End Sub Private WithEvents miAbout As System.Windows.Forms.ToolStripMenuItem Private WithEvents miExit As System.Windows.Forms.ToolStripMenuItem Friend WithEvents btnChgTimeZone As System.Windows.Forms.Button + Friend WithEvents tbcStartDateTime As DataGridViewTextBoxColumn + Friend WithEvents tbcSummary As DataGridViewTextBoxColumn + Friend WithEvents tbcOrganizer As DataGridViewTextBoxColumn + Friend WithEvents tbcComment As DataGridViewTextBoxColumn End Class diff --git a/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.vb b/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.vb index c07223c..8f3cad5 100644 --- a/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.vb +++ b/Source/VBNetDemos/CalendarBrowser/CalendarBrowserForm.vb @@ -20,12 +20,9 @@ ' 05/21/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System Imports System.ComponentModel -Imports System.Drawing Imports System.IO Imports System.Text -Imports System.Windows.Forms Imports Microsoft.VisualBasic Imports EWSoftware.PDI @@ -37,7 +34,7 @@ Imports EWSoftware.PDI.Properties ''' This application demonstrates loading, saving, and managing a vCalendar or iCalendar file including how to ''' edit the properties on the various components. ''' -Public Partial Class CalendarBrowserForm +Partial Public Class CalendarBrowserForm Inherits System.Windows.Forms.Form Private vCal As VCalendar ' The calendar being browsed @@ -49,8 +46,8 @@ Public Partial Class CalendarBrowserForm ''' Shared Sub Main(Args As String()) Application.EnableVisualStyles() - Application.SetCompatibleTextRenderingDefault(false) - Application.Run(new CalendarBrowserForm()) + Application.SetCompatibleTextRenderingDefault(False) + Application.Run(New CalendarBrowserForm()) End Sub ''' @@ -62,10 +59,11 @@ Public Partial Class CalendarBrowserForm InitializeComponent() ' The string format to use when drawing the status text - sf = New StringFormat(StringFormatFlags.NoWrap) - sf.Alignment = StringAlignment.Near - sf.LineAlignment = StringAlignment.Center - sf.Trimming = StringTrimming.EllipsisCharacter + sf = New StringFormat(StringFormatFlags.NoWrap) With { + .Alignment = StringAlignment.Near, + .LineAlignment = StringAlignment.Center, + .Trimming = StringTrimming.EllipsisCharacter + } dgvCalendar.AutoGenerateColumns = False @@ -103,7 +101,7 @@ Public Partial Class CalendarBrowserForm ''' True to connect list change event, false to not connect it Private Sub LoadGridWithItems(connectEvents As Boolean) Dim modFlag As Boolean = wasModified - DIm gridIdx As Integer = dgvCalendar.CurrentCellAddress.Y + Dim gridIdx As Integer = dgvCalendar.CurrentCellAddress.Y ' The ListChanged event is connected so that we are notified when the lists are modified If connectEvents Then @@ -186,13 +184,13 @@ Public Partial Class CalendarBrowserForm ''' ''' The sender of the event ''' The event arguments - Private Sub CalendarBrowserForm_Closing(sender As Object, _ + Private Sub CalendarBrowserForm_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles MyBase.Closing If wasModified = True AndAlso MessageBox.Show("Do you want to discard your changes to the current calendar?", "Discard Changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = System.Windows.Forms.DialogResult.No Then e.Cancel = True - End if + End If End Sub ''' @@ -411,7 +409,7 @@ Public Partial Class CalendarBrowserForm td.UniqueId.AssignNewId(True) vCal.ToDos.Add(td) - End if + End If End Using Case 2 @@ -575,7 +573,7 @@ Public Partial Class CalendarBrowserForm "properties will be lost when the file is saved.", "Change Calendar Version", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = System.Windows.Forms.DialogResult.Yes Then vCal.Version = SpecificationVersions.iCalendar20 - End if + End If End If LoadComponentList() @@ -588,9 +586,9 @@ Public Partial Class CalendarBrowserForm ''' ''' The sender of the event ''' The event arguments - Private Sub cboComponents_SelectedIndexChanged(sender As Object, _ + Private Sub cboComponents_SelectedIndexChanged(sender As Object, e As System.EventArgs) Handles cboComponents.SelectedIndexChanged - Select cboComponents.SelectedIndex + Select Case cboComponents.SelectedIndex Case 0 tbcSummary.Visible = True tbcSummary.HeaderText = "Event Summary" @@ -627,7 +625,7 @@ Public Partial Class CalendarBrowserForm dlg.Modified = wasModified dlg.ShowDialog() - If wasModified <> dlg.Modified + If wasModified <> dlg.Modified Then wasModified = dlg.Modified LoadGridWithItems(False) End If @@ -639,8 +637,8 @@ Public Partial Class CalendarBrowserForm ''' ''' The sender of the event ''' The event arguments - Private Sub ChangeFileEncoding_Click(ByVal sender As System.Object, _ - ByVal e As System.EventArgs) Handles miFileUnicode.Click, _ + Private Sub ChangeFileEncoding_Click(ByVal sender As System.Object, + ByVal e As System.EventArgs) Handles miFileUnicode.Click, miFileWestEuro.Click, miFileASCII.Click If sender Is miFileUnicode Then miFileUnicode.Checked = True @@ -673,8 +671,8 @@ Public Partial Class CalendarBrowserForm ''' ''' The sender of the event ''' The event arguments - Private Sub ChangePropertyEncoding_Click(ByVal sender As System.Object, _ - ByVal e As System.EventArgs) Handles miPropUnicode.Click, _ + Private Sub ChangePropertyEncoding_Click(ByVal sender As System.Object, + ByVal e As System.EventArgs) Handles miPropUnicode.Click, miPropWestEuro.Click, miPropASCII.Click If sender Is miPropUnicode Then miPropUnicode.Checked = True @@ -707,7 +705,7 @@ Public Partial Class CalendarBrowserForm ''' ''' The sender of the event ''' The event arguments - Private Sub dgvCalendar_CellPainting(sender As Object, _ + Private Sub dgvCalendar_CellPainting(sender As Object, e As DataGridViewCellPaintingEventArgs) Handles dgvCalendar.CellPainting Dim cm As CurrencyManager Dim startProp As StartDateProperty @@ -719,19 +717,19 @@ Public Partial Class CalendarBrowserForm Dim item As Object Dim columnText As String = Nothing - If e.RowIndex > -1 AndAlso (e.ColumnIndex = 0 OrElse _ + If e.RowIndex > -1 AndAlso (e.ColumnIndex = 0 OrElse e.ColumnIndex = 1) Then cm = DirectCast(dgvCalendar.BindingContext(dgvCalendar.DataSource), CurrencyManager) item = cm.List(e.RowIndex) If e.ColumnIndex = 0 Then - If TypeOf item is VEvent Then + If TypeOf item Is VEvent Then startProp = DirectCast(item, VEvent).StartDateTime Else - If TypeOf item is VToDo Then + If TypeOf item Is VToDo Then startProp = DirectCast(item, VToDo).StartDateTime Else - If TypeOf item is VJournal Then + If TypeOf item Is VJournal Then startProp = DirectCast(item, VJournal).StartDateTime Else startProp = DirectCast(item, VFreeBusy).StartDateTime @@ -749,15 +747,15 @@ Public Partial Class CalendarBrowserForm End If Else If e.ColumnIndex = 1 Then - If TypeOf item is VEvent Then + If TypeOf item Is VEvent Then summaryProp = DirectCast(item, VEvent).Summary descProp = DirectCast(item, VEvent).Description Else - If TypeOf item is VToDo Then + If TypeOf item Is VToDo Then summaryProp = DirectCast(item, VToDo).Summary descProp = DirectCast(item, VToDo).Description Else - If TypeOf item is VJournal Then + If TypeOf item Is VJournal Then summaryProp = DirectCast(item, VJournal).Summary descProp = DirectCast(item, VJournal).Description Else @@ -807,8 +805,10 @@ Public Partial Class CalendarBrowserForm ''' ''' The sender of the event ''' The event arguments - Private Sub dgvCalendar_CellDoubleClick( sender As Object, e As DataGridViewCellEventArgs) Handles dgvCalendar.CellDoubleClick - btnEdit_Click(sender, e) + Private Sub dgvCalendar_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvCalendar.CellDoubleClick + If e.RowIndex > -1 Then + btnEdit_Click(sender, e) + End If End Sub ''' @@ -819,7 +819,7 @@ Public Partial Class CalendarBrowserForm ''' Due to the variety of properties in a calendar object, sorting is left up to the developer ''' utilizing a comparison delegate. This example sorts the collection by the start date/time property and, ''' if they are equal, the summary description. This is used to handle all of the collection types. - Private Function CalendarSorter(x As CalendarObject, y As CalendarObject) As Integer + Private Shared Function CalendarSorter(x As CalendarObject, y As CalendarObject) As Integer Dim d1, d2 As DateTime Dim summary1, summary2 As String @@ -831,7 +831,7 @@ Public Partial Class CalendarBrowserForm summary1 = e1.Summary.Value summary2 = e2.Summary.Value - ElseIf TypeOf x Is VToDo + ElseIf TypeOf x Is VToDo Then Dim t1 As VToDo = DirectCast(x, VToDo), t2 As VToDo = DirectCast(y, VToDo) d1 = t1.StartDateTime.TimeZoneDateTime @@ -839,7 +839,7 @@ Public Partial Class CalendarBrowserForm summary1 = t1.Summary.Value summary2 = t2.Summary.Value - ElseIf TypeOf x Is VJournal + ElseIf TypeOf x Is VJournal Then Dim j1 As VJournal = DirectCast(x, VJournal), j2 As VJournal = DirectCast(y, VJournal) d1 = j1.StartDateTime.TimeZoneDateTime diff --git a/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.Designer.vb b/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.Designer.vb index 9e009d8..308da3e 100644 --- a/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.Designer.vb @@ -110,7 +110,7 @@ Partial Class CalendarObjectDlg ' Me.btnCancel.CausesValidation = false Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(542, 494) + Me.btnCancel.Location = New System.Drawing.Point(653, 554) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(88, 32) Me.btnCancel.TabIndex = 18 @@ -119,7 +119,7 @@ Partial Class CalendarObjectDlg 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(12, 494) + Me.btnOK.Location = New System.Drawing.Point(12, 554) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(88, 32) Me.btnOK.TabIndex = 17 @@ -127,10 +127,10 @@ Partial Class CalendarObjectDlg ' 'txtUniqueId ' - Me.txtUniqueId.Location = New System.Drawing.Point(112, 12) + Me.txtUniqueId.Location = New System.Drawing.Point(140, 12) Me.txtUniqueId.Name = "txtUniqueId" Me.txtUniqueId.ReadOnly = true - Me.txtUniqueId.Size = New System.Drawing.Size(376, 22) + Me.txtUniqueId.Size = New System.Drawing.Size(376, 26) Me.txtUniqueId.TabIndex = 1 Me.txtUniqueId.TabStop = false ' @@ -143,10 +143,10 @@ Partial Class CalendarObjectDlg Me.tabInfo.Controls.Add(Me.pgAttachments) Me.tabInfo.Controls.Add(Me.pgAlarms) Me.tabInfo.Controls.Add(Me.pgMisc) - Me.tabInfo.Location = New System.Drawing.Point(12, 136) + Me.tabInfo.Location = New System.Drawing.Point(12, 155) Me.tabInfo.Name = "tabInfo" Me.tabInfo.SelectedIndex = 0 - Me.tabInfo.Size = New System.Drawing.Size(618, 352) + Me.tabInfo.Size = New System.Drawing.Size(733, 393) Me.tabInfo.TabIndex = 16 ' 'pgGeneral @@ -173,23 +173,23 @@ Partial Class CalendarObjectDlg Me.pgGeneral.Controls.Add(Me.dtpCompleted) Me.pgGeneral.Controls.Add(Me.lblPercent) Me.pgGeneral.Controls.Add(Me.udcPercent) - Me.pgGeneral.Location = New System.Drawing.Point(4, 25) + Me.pgGeneral.Location = New System.Drawing.Point(4, 29) Me.pgGeneral.Name = "pgGeneral" - Me.pgGeneral.Size = New System.Drawing.Size(610, 323) + Me.pgGeneral.Size = New System.Drawing.Size(725, 360) Me.pgGeneral.TabIndex = 3 Me.pgGeneral.Text = "General" Me.pgGeneral.UseVisualStyleBackColor = true ' 'txtLocation ' - Me.txtLocation.Location = New System.Drawing.Point(112, 152) + Me.txtLocation.Location = New System.Drawing.Point(117, 154) Me.txtLocation.Name = "txtLocation" - Me.txtLocation.Size = New System.Drawing.Size(424, 22) + Me.txtLocation.Size = New System.Drawing.Size(580, 26) Me.txtLocation.TabIndex = 15 ' 'lblLocation ' - Me.lblLocation.Location = New System.Drawing.Point(29, 152) + Me.lblLocation.Location = New System.Drawing.Point(34, 154) Me.lblLocation.Name = "lblLocation" Me.lblLocation.Size = New System.Drawing.Size(77, 23) Me.lblLocation.TabIndex = 14 @@ -199,32 +199,32 @@ Partial Class CalendarObjectDlg 'cboStatus ' Me.cboStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboStatus.Location = New System.Drawing.Point(112, 48) + Me.cboStatus.Location = New System.Drawing.Point(117, 48) Me.cboStatus.Name = "cboStatus" - Me.cboStatus.Size = New System.Drawing.Size(116, 24) + Me.cboStatus.Size = New System.Drawing.Size(151, 28) Me.cboStatus.TabIndex = 5 ' 'label18 ' - Me.label18.Location = New System.Drawing.Point(51, 48) + Me.label18.Location = New System.Drawing.Point(28, 50) Me.label18.Name = "label18" - Me.label18.Size = New System.Drawing.Size(55, 23) + Me.label18.Size = New System.Drawing.Size(83, 23) Me.label18.TabIndex = 4 Me.label18.Text = "Status" Me.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtResources ' - Me.txtResources.Location = New System.Drawing.Point(112, 288) + Me.txtResources.Location = New System.Drawing.Point(117, 318) Me.txtResources.Name = "txtResources" - Me.txtResources.Size = New System.Drawing.Size(440, 22) + Me.txtResources.Size = New System.Drawing.Size(580, 26) Me.txtResources.TabIndex = 21 ' 'lblResources ' - Me.lblResources.Location = New System.Drawing.Point(19, 288) + Me.lblResources.Location = New System.Drawing.Point(12, 318) Me.lblResources.Name = "lblResources" - Me.lblResources.Size = New System.Drawing.Size(87, 23) + Me.lblResources.Size = New System.Drawing.Size(99, 23) Me.lblResources.TabIndex = 20 Me.lblResources.Text = "Resources" Me.lblResources.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -232,32 +232,32 @@ Partial Class CalendarObjectDlg 'txtDescription ' Me.txtDescription.AcceptsReturn = true - Me.txtDescription.Location = New System.Drawing.Point(112, 184) + Me.txtDescription.Location = New System.Drawing.Point(117, 186) Me.txtDescription.Multiline = true Me.txtDescription.Name = "txtDescription" Me.txtDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtDescription.Size = New System.Drawing.Size(424, 56) + Me.txtDescription.Size = New System.Drawing.Size(580, 82) Me.txtDescription.TabIndex = 17 ' 'label11 ' - Me.label11.Location = New System.Drawing.Point(19, 184) + Me.label11.Location = New System.Drawing.Point(8, 186) Me.label11.Name = "label11" - Me.label11.Size = New System.Drawing.Size(87, 23) + Me.label11.Size = New System.Drawing.Size(103, 23) Me.label11.TabIndex = 16 Me.label11.Text = "Description" Me.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtSummary ' - Me.txtSummary.Location = New System.Drawing.Point(112, 120) + Me.txtSummary.Location = New System.Drawing.Point(117, 122) Me.txtSummary.Name = "txtSummary" - Me.txtSummary.Size = New System.Drawing.Size(424, 22) + Me.txtSummary.Size = New System.Drawing.Size(580, 26) Me.txtSummary.TabIndex = 13 ' 'label8 ' - Me.label8.Location = New System.Drawing.Point(27, 120) + Me.label8.Location = New System.Drawing.Point(32, 122) Me.label8.Name = "label8" Me.label8.Size = New System.Drawing.Size(79, 23) Me.label8.TabIndex = 12 @@ -266,34 +266,34 @@ Partial Class CalendarObjectDlg ' 'txtCategories ' - Me.txtCategories.Location = New System.Drawing.Point(112, 256) + Me.txtCategories.Location = New System.Drawing.Point(117, 286) Me.txtCategories.Name = "txtCategories" - Me.txtCategories.Size = New System.Drawing.Size(440, 22) + Me.txtCategories.Size = New System.Drawing.Size(580, 26) Me.txtCategories.TabIndex = 19 ' 'label21 ' - Me.label21.Location = New System.Drawing.Point(19, 256) + Me.label21.Location = New System.Drawing.Point(12, 286) Me.label21.Name = "label21" - Me.label21.Size = New System.Drawing.Size(87, 23) + Me.label21.Size = New System.Drawing.Size(99, 23) Me.label21.TabIndex = 18 Me.label21.Text = "&Categories" Me.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'lblEndDate ' - Me.lblEndDate.Location = New System.Drawing.Point(338, 16) + Me.lblEndDate.Location = New System.Drawing.Point(379, 16) Me.lblEndDate.Name = "lblEndDate" - Me.lblEndDate.Size = New System.Drawing.Size(40, 23) + Me.lblEndDate.Size = New System.Drawing.Size(57, 23) Me.lblEndDate.TabIndex = 2 Me.lblEndDate.Text = "End" Me.lblEndDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtDuration ' - Me.txtDuration.Location = New System.Drawing.Point(384, 48) + Me.txtDuration.Location = New System.Drawing.Point(389, 48) Me.txtDuration.Name = "txtDuration" - Me.txtDuration.Size = New System.Drawing.Size(80, 22) + Me.txtDuration.Size = New System.Drawing.Size(116, 26) Me.txtDuration.TabIndex = 7 ' 'dtpEndDate @@ -301,10 +301,10 @@ Partial Class CalendarObjectDlg Me.dtpEndDate.Checked = false Me.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpEndDate.Location = New System.Drawing.Point(384, 16) + Me.dtpEndDate.Location = New System.Drawing.Point(442, 16) Me.dtpEndDate.Name = "dtpEndDate" Me.dtpEndDate.ShowCheckBox = true - Me.dtpEndDate.Size = New System.Drawing.Size(210, 22) + Me.dtpEndDate.Size = New System.Drawing.Size(255, 26) Me.dtpEndDate.TabIndex = 3 ' 'dtpStartDate @@ -312,35 +312,35 @@ Partial Class CalendarObjectDlg Me.dtpStartDate.Checked = false Me.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpStartDate.Location = New System.Drawing.Point(112, 16) + Me.dtpStartDate.Location = New System.Drawing.Point(117, 16) Me.dtpStartDate.Name = "dtpStartDate" Me.dtpStartDate.ShowCheckBox = true - Me.dtpStartDate.Size = New System.Drawing.Size(210, 22) + Me.dtpStartDate.Size = New System.Drawing.Size(255, 26) Me.dtpStartDate.TabIndex = 1 ' 'lblDuration ' - Me.lblDuration.Location = New System.Drawing.Point(309, 48) + Me.lblDuration.Location = New System.Drawing.Point(284, 50) Me.lblDuration.Name = "lblDuration" - Me.lblDuration.Size = New System.Drawing.Size(69, 23) + Me.lblDuration.Size = New System.Drawing.Size(99, 23) Me.lblDuration.TabIndex = 6 Me.lblDuration.Text = "Duration" Me.lblDuration.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(61, 16) + Me.label1.Location = New System.Drawing.Point(51, 16) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(45, 23) + Me.label1.Size = New System.Drawing.Size(60, 23) Me.label1.TabIndex = 0 Me.label1.Text = "&Start" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'lblCompleted ' - Me.lblCompleted.Location = New System.Drawing.Point(291, 79) + Me.lblCompleted.Location = New System.Drawing.Point(267, 83) Me.lblCompleted.Name = "lblCompleted" - Me.lblCompleted.Size = New System.Drawing.Size(87, 23) + Me.lblCompleted.Size = New System.Drawing.Size(116, 23) Me.lblCompleted.TabIndex = 10 Me.lblCompleted.Text = "Completed" Me.lblCompleted.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -350,26 +350,26 @@ Partial Class CalendarObjectDlg Me.dtpCompleted.Checked = false Me.dtpCompleted.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpCompleted.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpCompleted.Location = New System.Drawing.Point(384, 79) + Me.dtpCompleted.Location = New System.Drawing.Point(389, 81) Me.dtpCompleted.Name = "dtpCompleted" Me.dtpCompleted.ShowCheckBox = true - Me.dtpCompleted.Size = New System.Drawing.Size(210, 22) + Me.dtpCompleted.Size = New System.Drawing.Size(255, 26) Me.dtpCompleted.TabIndex = 11 ' 'lblPercent ' - Me.lblPercent.Location = New System.Drawing.Point(42, 79) + Me.lblPercent.Location = New System.Drawing.Point(18, 83) Me.lblPercent.Name = "lblPercent" - Me.lblPercent.Size = New System.Drawing.Size(64, 23) + Me.lblPercent.Size = New System.Drawing.Size(93, 23) Me.lblPercent.TabIndex = 8 Me.lblPercent.Text = "% Done" Me.lblPercent.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'udcPercent ' - Me.udcPercent.Location = New System.Drawing.Point(112, 80) + Me.udcPercent.Location = New System.Drawing.Point(117, 82) Me.udcPercent.Name = "udcPercent" - Me.udcPercent.Size = New System.Drawing.Size(56, 22) + Me.udcPercent.Size = New System.Drawing.Size(65, 26) Me.udcPercent.TabIndex = 9 Me.udcPercent.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -379,9 +379,9 @@ Partial Class CalendarObjectDlg Me.pgAttendees.Controls.Add(Me.txtOrganizer) Me.pgAttendees.Controls.Add(Me.label5) Me.pgAttendees.Controls.Add(Me.ucAttendees) - Me.pgAttendees.Location = New System.Drawing.Point(4, 25) + Me.pgAttendees.Location = New System.Drawing.Point(4, 29) Me.pgAttendees.Name = "pgAttendees" - Me.pgAttendees.Size = New System.Drawing.Size(610, 323) + Me.pgAttendees.Size = New System.Drawing.Size(725, 360) Me.pgAttendees.TabIndex = 0 Me.pgAttendees.Text = "Attendees" Me.pgAttendees.UseVisualStyleBackColor = true @@ -389,58 +389,58 @@ Partial Class CalendarObjectDlg ' 'groupBox1 ' - Me.groupBox1.Location = New System.Drawing.Point(36, 48) + Me.groupBox1.Location = New System.Drawing.Point(66, 75) Me.groupBox1.Name = "groupBox1" - Me.groupBox1.Size = New System.Drawing.Size(544, 8) + Me.groupBox1.Size = New System.Drawing.Size(597, 8) Me.groupBox1.TabIndex = 2 Me.groupBox1.TabStop = false ' 'txtOrganizer ' - Me.txtOrganizer.Location = New System.Drawing.Point(116, 16) + Me.txtOrganizer.Location = New System.Drawing.Point(215, 34) Me.txtOrganizer.Name = "txtOrganizer" - Me.txtOrganizer.Size = New System.Drawing.Size(448, 22) + Me.txtOrganizer.Size = New System.Drawing.Size(448, 26) Me.txtOrganizer.TabIndex = 1 ' 'label5 ' - Me.label5.Location = New System.Drawing.Point(23, 16) + Me.label5.Location = New System.Drawing.Point(105, 36) Me.label5.Name = "label5" - Me.label5.Size = New System.Drawing.Size(87, 23) + Me.label5.Size = New System.Drawing.Size(104, 23) Me.label5.TabIndex = 0 Me.label5.Text = "&Organizer" Me.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'ucAttendees ' - Me.ucAttendees.Location = New System.Drawing.Point(57, 72) + Me.ucAttendees.Location = New System.Drawing.Point(66, 100) Me.ucAttendees.Name = "ucAttendees" - Me.ucAttendees.Size = New System.Drawing.Size(496, 216) + Me.ucAttendees.Size = New System.Drawing.Size(597, 227) Me.ucAttendees.TabIndex = 3 ' 'pgRecurrence ' Me.pgRecurrence.Controls.Add(Me.ucRecurrences) - Me.pgRecurrence.Location = New System.Drawing.Point(4, 25) + Me.pgRecurrence.Location = New System.Drawing.Point(4, 29) Me.pgRecurrence.Name = "pgRecurrence" - Me.pgRecurrence.Size = New System.Drawing.Size(610, 323) + Me.pgRecurrence.Size = New System.Drawing.Size(725, 360) Me.pgRecurrence.TabIndex = 4 Me.pgRecurrence.Text = "Recurrence" Me.pgRecurrence.UseVisualStyleBackColor = true ' 'ucRecurrences ' - Me.ucRecurrences.Location = New System.Drawing.Point(33, 21) + Me.ucRecurrences.Location = New System.Drawing.Point(19, 17) Me.ucRecurrences.Name = "ucRecurrences" - Me.ucRecurrences.Size = New System.Drawing.Size(545, 280) + Me.ucRecurrences.Size = New System.Drawing.Size(686, 327) Me.ucRecurrences.TabIndex = 0 ' 'pgExceptions ' Me.pgExceptions.Controls.Add(Me.ucExceptions) - Me.pgExceptions.Location = New System.Drawing.Point(4, 25) + Me.pgExceptions.Location = New System.Drawing.Point(4, 29) Me.pgExceptions.Name = "pgExceptions" - Me.pgExceptions.Size = New System.Drawing.Size(610, 323) + Me.pgExceptions.Size = New System.Drawing.Size(725, 360) Me.pgExceptions.TabIndex = 5 Me.pgExceptions.Text = "Exceptions" Me.pgExceptions.UseVisualStyleBackColor = true @@ -448,17 +448,17 @@ Partial Class CalendarObjectDlg 'ucExceptions ' Me.ucExceptions.EditsExceptions = true - Me.ucExceptions.Location = New System.Drawing.Point(33, 21) + Me.ucExceptions.Location = New System.Drawing.Point(19, 17) Me.ucExceptions.Name = "ucExceptions" - Me.ucExceptions.Size = New System.Drawing.Size(545, 280) + Me.ucExceptions.Size = New System.Drawing.Size(686, 327) Me.ucExceptions.TabIndex = 0 ' 'pgAttachments ' Me.pgAttachments.Controls.Add(Me.ucAttachments) - Me.pgAttachments.Location = New System.Drawing.Point(4, 25) + Me.pgAttachments.Location = New System.Drawing.Point(4, 29) Me.pgAttachments.Name = "pgAttachments" - Me.pgAttachments.Size = New System.Drawing.Size(610, 323) + Me.pgAttachments.Size = New System.Drawing.Size(725, 360) Me.pgAttachments.TabIndex = 1 Me.pgAttachments.Text = "Attachments" Me.pgAttachments.UseVisualStyleBackColor = true @@ -466,26 +466,26 @@ Partial Class CalendarObjectDlg ' 'ucAttachments ' - Me.ucAttachments.Location = New System.Drawing.Point(17, 9) + Me.ucAttachments.Location = New System.Drawing.Point(40, 17) Me.ucAttachments.Name = "ucAttachments" - Me.ucAttachments.Size = New System.Drawing.Size(576, 304) + Me.ucAttachments.Size = New System.Drawing.Size(649, 327) Me.ucAttachments.TabIndex = 0 ' 'pgAlarms ' Me.pgAlarms.Controls.Add(Me.ucAlarms) - Me.pgAlarms.Location = New System.Drawing.Point(4, 25) + Me.pgAlarms.Location = New System.Drawing.Point(4, 29) Me.pgAlarms.Name = "pgAlarms" - Me.pgAlarms.Size = New System.Drawing.Size(610, 323) + Me.pgAlarms.Size = New System.Drawing.Size(725, 360) Me.pgAlarms.TabIndex = 7 Me.pgAlarms.Text = "Alarms" Me.pgAlarms.UseVisualStyleBackColor = true ' 'ucAlarms ' - Me.ucAlarms.Location = New System.Drawing.Point(15, 5) + Me.ucAlarms.Location = New System.Drawing.Point(24, 7) Me.ucAlarms.Name = "ucAlarms" - Me.ucAlarms.Size = New System.Drawing.Size(581, 312) + Me.ucAlarms.Size = New System.Drawing.Size(677, 347) Me.ucAlarms.TabIndex = 0 ' 'pgMisc @@ -502,16 +502,16 @@ Partial Class CalendarObjectDlg Me.pgMisc.Controls.Add(Me.label17) Me.pgMisc.Controls.Add(Me.txtUrl) Me.pgMisc.Controls.Add(Me.label3) - Me.pgMisc.Location = New System.Drawing.Point(4, 25) + Me.pgMisc.Location = New System.Drawing.Point(4, 29) Me.pgMisc.Name = "pgMisc" - Me.pgMisc.Size = New System.Drawing.Size(610, 323) + Me.pgMisc.Size = New System.Drawing.Size(725, 360) Me.pgMisc.TabIndex = 6 Me.pgMisc.Text = "Misc" Me.pgMisc.UseVisualStyleBackColor = true ' 'groupBox3 ' - Me.groupBox3.Location = New System.Drawing.Point(197, 0) + Me.groupBox3.Location = New System.Drawing.Point(241, 0) Me.groupBox3.Name = "groupBox3" Me.groupBox3.Size = New System.Drawing.Size(2, 160) Me.groupBox3.TabIndex = 5 @@ -521,53 +521,53 @@ Partial Class CalendarObjectDlg ' Me.groupBox2.Location = New System.Drawing.Point(8, 162) Me.groupBox2.Name = "groupBox2" - Me.groupBox2.Size = New System.Drawing.Size(600, 8) + Me.groupBox2.Size = New System.Drawing.Size(700, 8) Me.groupBox2.TabIndex = 7 Me.groupBox2.TabStop = false ' 'ucRequestStatus ' - Me.ucRequestStatus.Location = New System.Drawing.Point(203, 16) + Me.ucRequestStatus.Location = New System.Drawing.Point(247, 16) Me.ucRequestStatus.Name = "ucRequestStatus" - Me.ucRequestStatus.Size = New System.Drawing.Size(402, 144) + Me.ucRequestStatus.Size = New System.Drawing.Size(471, 144) Me.ucRequestStatus.TabIndex = 6 ' 'btnFind ' - Me.btnFind.Location = New System.Drawing.Point(88, 100) + Me.btnFind.Location = New System.Drawing.Point(108, 100) Me.btnFind.Name = "btnFind" - Me.btnFind.Size = New System.Drawing.Size(64, 28) + Me.btnFind.Size = New System.Drawing.Size(88, 32) Me.btnFind.TabIndex = 4 Me.btnFind.Text = "&Find" ' 'txtLongitude ' - Me.txtLongitude.Location = New System.Drawing.Point(88, 72) + Me.txtLongitude.Location = New System.Drawing.Point(108, 68) Me.txtLongitude.Name = "txtLongitude" - Me.txtLongitude.Size = New System.Drawing.Size(88, 22) + Me.txtLongitude.Size = New System.Drawing.Size(120, 26) Me.txtLongitude.TabIndex = 3 ' 'lblLongitude ' - Me.lblLongitude.Location = New System.Drawing.Point(6, 72) + Me.lblLongitude.Location = New System.Drawing.Point(6, 70) Me.lblLongitude.Name = "lblLongitude" - Me.lblLongitude.Size = New System.Drawing.Size(76, 23) + Me.lblLongitude.Size = New System.Drawing.Size(96, 23) Me.lblLongitude.TabIndex = 2 Me.lblLongitude.Text = "Longitude" Me.lblLongitude.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtLatitude ' - Me.txtLatitude.Location = New System.Drawing.Point(88, 40) + Me.txtLatitude.Location = New System.Drawing.Point(108, 36) Me.txtLatitude.Name = "txtLatitude" - Me.txtLatitude.Size = New System.Drawing.Size(88, 22) + Me.txtLatitude.Size = New System.Drawing.Size(120, 26) Me.txtLatitude.TabIndex = 1 ' 'lblLatitude ' - Me.lblLatitude.Location = New System.Drawing.Point(18, 40) + Me.lblLatitude.Location = New System.Drawing.Point(6, 38) Me.lblLatitude.Name = "lblLatitude" - Me.lblLatitude.Size = New System.Drawing.Size(64, 23) + Me.lblLatitude.Size = New System.Drawing.Size(96, 23) Me.lblLatitude.TabIndex = 0 Me.lblLatitude.Text = "&Latitude" Me.lblLatitude.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -579,14 +579,14 @@ Partial Class CalendarObjectDlg Me.txtComments.Multiline = true Me.txtComments.Name = "txtComments" Me.txtComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtComments.Size = New System.Drawing.Size(424, 64) + Me.txtComments.Size = New System.Drawing.Size(554, 127) Me.txtComments.TabIndex = 11 ' 'label17 ' - Me.label17.Location = New System.Drawing.Point(54, 216) + Me.label17.Location = New System.Drawing.Point(32, 218) Me.label17.Name = "label17" - Me.label17.Size = New System.Drawing.Size(80, 23) + Me.label17.Size = New System.Drawing.Size(102, 23) Me.label17.TabIndex = 10 Me.label17.Text = "&Comments" Me.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -595,23 +595,23 @@ Partial Class CalendarObjectDlg ' Me.txtUrl.Location = New System.Drawing.Point(140, 184) Me.txtUrl.Name = "txtUrl" - Me.txtUrl.Size = New System.Drawing.Size(424, 22) + Me.txtUrl.Size = New System.Drawing.Size(554, 26) Me.txtUrl.TabIndex = 9 ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(94, 184) + Me.label3.Location = New System.Drawing.Point(58, 186) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(40, 23) + Me.label3.Size = New System.Drawing.Size(76, 23) Me.label3.TabIndex = 8 Me.label3.Text = "&URL" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'label9 ' - Me.label9.Location = New System.Drawing.Point(26, 11) + Me.label9.Location = New System.Drawing.Point(25, 14) Me.label9.Name = "label9" - Me.label9.Size = New System.Drawing.Size(80, 23) + Me.label9.Size = New System.Drawing.Size(109, 23) Me.label9.TabIndex = 0 Me.label9.Text = "Unique ID" Me.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -619,97 +619,97 @@ Partial Class CalendarObjectDlg 'txtClass ' Me.txtClass.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper - Me.txtClass.Location = New System.Drawing.Point(112, 98) + Me.txtClass.Location = New System.Drawing.Point(140, 110) Me.txtClass.Name = "txtClass" - Me.txtClass.Size = New System.Drawing.Size(144, 22) + Me.txtClass.Size = New System.Drawing.Size(144, 26) Me.txtClass.TabIndex = 11 ' 'label10 ' - Me.label10.Location = New System.Drawing.Point(58, 97) + Me.label10.Location = New System.Drawing.Point(48, 112) Me.label10.Name = "label10" - Me.label10.Size = New System.Drawing.Size(48, 23) + Me.label10.Size = New System.Drawing.Size(86, 23) Me.label10.TabIndex = 10 Me.label10.Text = "Class" Me.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtLastModified ' - Me.txtLastModified.Location = New System.Drawing.Point(400, 40) + Me.txtLastModified.Location = New System.Drawing.Point(496, 44) Me.txtLastModified.Name = "txtLastModified" Me.txtLastModified.ReadOnly = true - Me.txtLastModified.Size = New System.Drawing.Size(168, 22) + Me.txtLastModified.Size = New System.Drawing.Size(207, 26) Me.txtLastModified.TabIndex = 6 Me.txtLastModified.TabStop = false ' 'label6 ' - Me.label6.Location = New System.Drawing.Point(298, 40) + Me.label6.Location = New System.Drawing.Point(363, 46) Me.label6.Name = "label6" - Me.label6.Size = New System.Drawing.Size(96, 23) + Me.label6.Size = New System.Drawing.Size(127, 23) Me.label6.TabIndex = 5 Me.label6.Text = "Last Modified" Me.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtCreated ' - Me.txtCreated.Location = New System.Drawing.Point(112, 40) + Me.txtCreated.Location = New System.Drawing.Point(140, 44) Me.txtCreated.Name = "txtCreated" Me.txtCreated.ReadOnly = true - Me.txtCreated.Size = New System.Drawing.Size(168, 22) + Me.txtCreated.Size = New System.Drawing.Size(207, 26) Me.txtCreated.TabIndex = 4 Me.txtCreated.TabStop = false ' 'label7 ' - Me.label7.Location = New System.Drawing.Point(34, 40) + Me.label7.Location = New System.Drawing.Point(44, 46) Me.label7.Name = "label7" - Me.label7.Size = New System.Drawing.Size(72, 23) + Me.label7.Size = New System.Drawing.Size(90, 23) Me.label7.TabIndex = 3 Me.label7.Text = "Created" Me.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'udcSequence ' - Me.udcSequence.Location = New System.Drawing.Point(352, 98) + Me.udcSequence.Location = New System.Drawing.Point(401, 110) Me.udcSequence.Maximum = New Decimal(New Integer() {1048576, 0, 0, 0}) Me.udcSequence.Name = "udcSequence" - Me.udcSequence.Size = New System.Drawing.Size(64, 22) + Me.udcSequence.Size = New System.Drawing.Size(97, 26) Me.udcSequence.TabIndex = 13 Me.udcSequence.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'label15 ' - Me.label15.Location = New System.Drawing.Point(266, 98) + Me.label15.Location = New System.Drawing.Point(291, 112) Me.label15.Name = "label15" - Me.label15.Size = New System.Drawing.Size(80, 23) + Me.label15.Size = New System.Drawing.Size(104, 23) Me.label15.TabIndex = 12 Me.label15.Text = "Sequence" Me.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'lblPriority ' - Me.lblPriority.Location = New System.Drawing.Point(434, 97) + Me.lblPriority.Location = New System.Drawing.Point(510, 112) Me.lblPriority.Name = "lblPriority" - Me.lblPriority.Size = New System.Drawing.Size(56, 23) + Me.lblPriority.Size = New System.Drawing.Size(77, 23) Me.lblPriority.TabIndex = 14 Me.lblPriority.Text = "Priority" Me.lblPriority.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'udcPriority ' - Me.udcPriority.Location = New System.Drawing.Point(496, 98) + Me.udcPriority.Location = New System.Drawing.Point(593, 110) Me.udcPriority.Maximum = New Decimal(New Integer() {9, 0, 0, 0}) Me.udcPriority.Name = "udcPriority" - Me.udcPriority.Size = New System.Drawing.Size(64, 22) + Me.udcPriority.Size = New System.Drawing.Size(61, 26) Me.udcPriority.TabIndex = 15 Me.udcPriority.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'chkTransparent ' - Me.chkTransparent.Location = New System.Drawing.Point(511, 12) + Me.chkTransparent.Location = New System.Drawing.Point(545, 14) Me.chkTransparent.Name = "chkTransparent" - Me.chkTransparent.Size = New System.Drawing.Size(119, 24) + Me.chkTransparent.Size = New System.Drawing.Size(154, 24) Me.chkTransparent.TabIndex = 2 Me.chkTransparent.Text = "Transparent" ' @@ -719,9 +719,9 @@ Partial Class CalendarObjectDlg ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(14, 68) + Me.label2.Location = New System.Drawing.Point(18, 79) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(92, 23) + Me.label2.Size = New System.Drawing.Size(116, 23) Me.label2.TabIndex = 7 Me.label2.Text = "&Time Zone" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -731,15 +731,15 @@ Partial Class CalendarObjectDlg Me.cboTimeZone.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.cboTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboTimeZone.Location = New System.Drawing.Point(112, 68) + Me.cboTimeZone.Location = New System.Drawing.Point(140, 76) Me.cboTimeZone.MaxDropDownItems = 16 Me.cboTimeZone.Name = "cboTimeZone" - Me.cboTimeZone.Size = New System.Drawing.Size(448, 24) + Me.cboTimeZone.Size = New System.Drawing.Size(514, 28) Me.cboTimeZone.TabIndex = 8 ' 'btnApplyTZ ' - Me.btnApplyTZ.Location = New System.Drawing.Point(566, 65) + Me.btnApplyTZ.Location = New System.Drawing.Point(660, 76) Me.btnApplyTZ.Name = "btnApplyTZ" Me.btnApplyTZ.Size = New System.Drawing.Size(64, 28) Me.btnApplyTZ.TabIndex = 9 @@ -749,7 +749,7 @@ Partial Class CalendarObjectDlg ' Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnCancel - Me.ClientSize = New System.Drawing.Size(642, 538) + Me.ClientSize = New System.Drawing.Size(757, 598) Me.Controls.Add(Me.btnApplyTZ) Me.Controls.Add(Me.label2) Me.Controls.Add(Me.cboTimeZone) diff --git a/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.vb b/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.vb index 6e0e64d..d82baa6 100644 --- a/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.vb +++ b/Source/VBNetDemos/CalendarBrowser/CalendarObjectDlg.vb @@ -19,10 +19,7 @@ ' 05/25/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System -Imports System.ComponentModel Imports System.Globalization -Imports System.Windows.Forms Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects diff --git a/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.Designer.vb b/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.Designer.vb index 8ad2113..64ca2b2 100644 --- a/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.Designer.vb @@ -37,17 +37,17 @@ Partial Class FreeBusyControl Me.dtpStartDate.Checked = false Me.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpStartDate.Location = New System.Drawing.Point(64, 48) + Me.dtpStartDate.Location = New System.Drawing.Point(95, 53) Me.dtpStartDate.Name = "dtpStartDate" Me.dtpStartDate.ShowCheckBox = true - Me.dtpStartDate.Size = New System.Drawing.Size(210, 22) + Me.dtpStartDate.Size = New System.Drawing.Size(255, 26) Me.dtpStartDate.TabIndex = 5 ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(18, 48) + Me.label1.Location = New System.Drawing.Point(19, 57) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(40, 23) + Me.label1.Size = New System.Drawing.Size(70, 23) Me.label1.TabIndex = 4 Me.label1.Text = "Start" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -57,17 +57,17 @@ Partial Class FreeBusyControl Me.dtpEndDate.Checked = false Me.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpEndDate.Location = New System.Drawing.Point(64, 88) + Me.dtpEndDate.Location = New System.Drawing.Point(95, 90) Me.dtpEndDate.Name = "dtpEndDate" Me.dtpEndDate.ShowCheckBox = true - Me.dtpEndDate.Size = New System.Drawing.Size(210, 22) + Me.dtpEndDate.Size = New System.Drawing.Size(255, 26) Me.dtpEndDate.TabIndex = 7 ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(18, 88) + Me.label2.Location = New System.Drawing.Point(23, 94) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(40, 23) + Me.label2.Size = New System.Drawing.Size(66, 23) Me.label2.TabIndex = 6 Me.label2.Text = "End" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -76,16 +76,16 @@ Partial Class FreeBusyControl ' Me.cboBusyType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboBusyType.Items.AddRange(New Object() {"None", "Free", "Busy", "Unavailable", "Tentative", "Other"}) - Me.cboBusyType.Location = New System.Drawing.Point(64, 8) + Me.cboBusyType.Location = New System.Drawing.Point(95, 14) Me.cboBusyType.Name = "cboBusyType" - Me.cboBusyType.Size = New System.Drawing.Size(112, 24) + Me.cboBusyType.Size = New System.Drawing.Size(128, 28) Me.cboBusyType.TabIndex = 1 ' 'label10 ' - Me.label10.Location = New System.Drawing.Point(10, 8) + Me.label10.Location = New System.Drawing.Point(15, 16) Me.label10.Name = "label10" - Me.label10.Size = New System.Drawing.Size(48, 23) + Me.label10.Size = New System.Drawing.Size(74, 23) Me.label10.TabIndex = 0 Me.label10.Text = "Type" Me.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -93,16 +93,16 @@ Partial Class FreeBusyControl 'txtOtherType ' Me.txtOtherType.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper - Me.txtOtherType.Location = New System.Drawing.Point(280, 8) + Me.txtOtherType.Location = New System.Drawing.Point(342, 14) Me.txtOtherType.Name = "txtOtherType" - Me.txtOtherType.Size = New System.Drawing.Size(136, 22) + Me.txtOtherType.Size = New System.Drawing.Size(136, 26) Me.txtOtherType.TabIndex = 3 ' 'label4 ' - Me.label4.Location = New System.Drawing.Point(194, 8) + Me.label4.Location = New System.Drawing.Point(229, 16) Me.label4.Name = "label4" - Me.label4.Size = New System.Drawing.Size(80, 23) + Me.label4.Size = New System.Drawing.Size(107, 23) Me.label4.TabIndex = 2 Me.label4.Text = "Other Type" Me.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -118,7 +118,7 @@ Partial Class FreeBusyControl Me.Controls.Add(Me.dtpStartDate) Me.Controls.Add(Me.label1) Me.Name = "FreeBusyControl" - Me.Size = New System.Drawing.Size(436, 152) + Me.Size = New System.Drawing.Size(503, 161) Me.Controls.SetChildIndex(Me.label1, 0) Me.Controls.SetChildIndex(Me.dtpStartDate, 0) Me.Controls.SetChildIndex(Me.label2, 0) diff --git a/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.vb b/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.vb index 0b61b78..3508d8d 100644 --- a/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.vb +++ b/Source/VBNetDemos/CalendarBrowser/FreeBusyControl.vb @@ -19,7 +19,6 @@ ' 05/25/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System Imports System.ComponentModel Imports System.Globalization Imports System.Windows.Forms @@ -27,7 +26,6 @@ Imports System.Windows.Forms Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms Public Partial Class FreeBusyControl Inherits EWSoftware.PDI.Windows.Forms.BrowseControl diff --git a/Source/VBNetDemos/CalendarBrowser/My Project/AssemblyInfoShared.vb b/Source/VBNetDemos/CalendarBrowser/My Project/AssemblyInfoShared.vb index 889ded6..017dc2e 100644 --- a/Source/VBNetDemos/CalendarBrowser/My Project/AssemblyInfoShared.vb +++ b/Source/VBNetDemos/CalendarBrowser/My Project/AssemblyInfoShared.vb @@ -2,7 +2,7 @@ ' System : EWSoftware PDI Demonstration Applications ' File : AssemblyInfo.cs ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 11/20/2018 +' Updated : 12/1/2018 ' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Visual Basic .NET ' @@ -51,5 +51,5 @@ Imports System.Runtime.InteropServices ' Day of release ' Revision (typically zero unless multiple releases are made on the same day) ' - - + + diff --git a/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.Designer.vb b/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.Designer.vb index 84064a8..ce6c737 100644 --- a/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.Designer.vb @@ -57,10 +57,10 @@ Partial Class ObservanceRuleControl ' Me.tabTimeZone.Controls.Add(Me.pgGeneral) Me.tabTimeZone.Controls.Add(Me.pgRules) - Me.tabTimeZone.Location = New System.Drawing.Point(8, 1) + Me.tabTimeZone.Location = New System.Drawing.Point(3, 3) Me.tabTimeZone.Name = "tabTimeZone" Me.tabTimeZone.SelectedIndex = 0 - Me.tabTimeZone.Size = New System.Drawing.Size(552, 315) + Me.tabTimeZone.Size = New System.Drawing.Size(694, 355) Me.tabTimeZone.TabIndex = 0 ' 'pgGeneral @@ -83,9 +83,9 @@ Partial Class ObservanceRuleControl Me.pgGeneral.Controls.Add(Me.label2) Me.pgGeneral.Controls.Add(Me.dtpStartDate) Me.pgGeneral.Controls.Add(Me.label1) - Me.pgGeneral.Location = New System.Drawing.Point(4, 25) + Me.pgGeneral.Location = New System.Drawing.Point(4, 29) Me.pgGeneral.Name = "pgGeneral" - Me.pgGeneral.Size = New System.Drawing.Size(544, 286) + Me.pgGeneral.Size = New System.Drawing.Size(686, 322) Me.pgGeneral.TabIndex = 0 Me.pgGeneral.Text = "General" Me.pgGeneral.UseVisualStyleBackColor = true @@ -94,16 +94,16 @@ Partial Class ObservanceRuleControl ' Me.cboRuleType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboRuleType.Items.AddRange(New Object() {"Standard", "Daylight"}) - Me.cboRuleType.Location = New System.Drawing.Point(136, 24) + Me.cboRuleType.Location = New System.Drawing.Point(174, 24) Me.cboRuleType.Name = "cboRuleType" - Me.cboRuleType.Size = New System.Drawing.Size(112, 24) + Me.cboRuleType.Size = New System.Drawing.Size(112, 28) Me.cboRuleType.TabIndex = 1 ' 'label10 ' - Me.label10.Location = New System.Drawing.Point(82, 24) + Me.label10.Location = New System.Drawing.Point(100, 26) Me.label10.Name = "label10" - Me.label10.Size = New System.Drawing.Size(48, 23) + Me.label10.Size = New System.Drawing.Size(68, 23) Me.label10.TabIndex = 0 Me.label10.Text = "Type" Me.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -111,49 +111,49 @@ Partial Class ObservanceRuleControl 'label7 ' Me.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.label7.Location = New System.Drawing.Point(294, 135) + Me.label7.Location = New System.Drawing.Point(384, 103) Me.label7.Name = "label7" - Me.label7.Size = New System.Drawing.Size(70, 23) + Me.label7.Size = New System.Drawing.Size(90, 23) Me.label7.TabIndex = 15 Me.label7.Text = "Minutes" Me.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'udcToMinutes ' - Me.udcToMinutes.Location = New System.Drawing.Point(240, 136) + Me.udcToMinutes.Location = New System.Drawing.Point(318, 136) Me.udcToMinutes.Maximum = New Decimal(New Integer() {59, 0, 0, 0}) Me.udcToMinutes.Minimum = New Decimal(New Integer() {59, 0, 0, -2147483648}) Me.udcToMinutes.Name = "udcToMinutes" - Me.udcToMinutes.Size = New System.Drawing.Size(48, 22) + Me.udcToMinutes.Size = New System.Drawing.Size(60, 26) Me.udcToMinutes.TabIndex = 14 Me.udcToMinutes.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'label8 ' Me.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.label8.Location = New System.Drawing.Point(190, 136) + Me.label8.Location = New System.Drawing.Point(240, 137) Me.label8.Name = "label8" - Me.label8.Size = New System.Drawing.Size(48, 23) + Me.label8.Size = New System.Drawing.Size(72, 23) Me.label8.TabIndex = 13 Me.label8.Text = "Hours" Me.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'udcToHours ' - Me.udcToHours.Location = New System.Drawing.Point(136, 136) + Me.udcToHours.Location = New System.Drawing.Point(174, 136) Me.udcToHours.Maximum = New Decimal(New Integer() {23, 0, 0, 0}) Me.udcToHours.Minimum = New Decimal(New Integer() {23, 0, 0, -2147483648}) Me.udcToHours.Name = "udcToHours" - Me.udcToHours.Size = New System.Drawing.Size(48, 22) + Me.udcToHours.Size = New System.Drawing.Size(60, 26) Me.udcToHours.TabIndex = 12 Me.udcToHours.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'label9 ' Me.label9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.label9.Location = New System.Drawing.Point(58, 136) + Me.label9.Location = New System.Drawing.Point(39, 137) Me.label9.Name = "label9" - Me.label9.Size = New System.Drawing.Size(72, 23) + Me.label9.Size = New System.Drawing.Size(129, 23) Me.label9.TabIndex = 11 Me.label9.Text = "Offset To" Me.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -161,9 +161,9 @@ Partial Class ObservanceRuleControl 'label6 ' Me.label6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.label6.Location = New System.Drawing.Point(294, 103) + Me.label6.Location = New System.Drawing.Point(384, 137) Me.label6.Name = "label6" - Me.label6.Size = New System.Drawing.Size(70, 23) + Me.label6.Size = New System.Drawing.Size(90, 23) Me.label6.TabIndex = 10 Me.label6.Text = "Minutes" Me.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -171,74 +171,74 @@ Partial Class ObservanceRuleControl 'txtComment ' Me.txtComment.AcceptsReturn = true - Me.txtComment.Location = New System.Drawing.Point(136, 176) + Me.txtComment.Location = New System.Drawing.Point(174, 176) Me.txtComment.Multiline = true Me.txtComment.Name = "txtComment" Me.txtComment.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtComment.Size = New System.Drawing.Size(392, 72) + Me.txtComment.Size = New System.Drawing.Size(455, 118) Me.txtComment.TabIndex = 17 ' 'label5 ' - Me.label5.Location = New System.Drawing.Point(58, 176) + Me.label5.Location = New System.Drawing.Point(43, 178) Me.label5.Name = "label5" - Me.label5.Size = New System.Drawing.Size(72, 23) + Me.label5.Size = New System.Drawing.Size(125, 23) Me.label5.TabIndex = 16 Me.label5.Text = "Comment" Me.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtTZName ' - Me.txtTZName.Location = New System.Drawing.Point(136, 64) + Me.txtTZName.Location = New System.Drawing.Point(174, 64) Me.txtTZName.Name = "txtTZName" - Me.txtTZName.Size = New System.Drawing.Size(264, 22) + Me.txtTZName.Size = New System.Drawing.Size(264, 26) Me.txtTZName.TabIndex = 5 ' 'label4 ' - Me.label4.Location = New System.Drawing.Point(10, 64) + Me.label4.Location = New System.Drawing.Point(16, 66) Me.label4.Name = "label4" - Me.label4.Size = New System.Drawing.Size(120, 23) + Me.label4.Size = New System.Drawing.Size(152, 23) Me.label4.TabIndex = 4 Me.label4.Text = "Time Zone Name" Me.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'udcFromMinutes ' - Me.udcFromMinutes.Location = New System.Drawing.Point(240, 104) + Me.udcFromMinutes.Location = New System.Drawing.Point(318, 104) Me.udcFromMinutes.Maximum = New Decimal(New Integer() {59, 0, 0, 0}) Me.udcFromMinutes.Minimum = New Decimal(New Integer() {59, 0, 0, -2147483648}) Me.udcFromMinutes.Name = "udcFromMinutes" - Me.udcFromMinutes.Size = New System.Drawing.Size(48, 22) + Me.udcFromMinutes.Size = New System.Drawing.Size(60, 26) Me.udcFromMinutes.TabIndex = 9 Me.udcFromMinutes.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'label3 ' Me.label3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.label3.Location = New System.Drawing.Point(190, 103) + Me.label3.Location = New System.Drawing.Point(240, 105) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(48, 23) + Me.label3.Size = New System.Drawing.Size(72, 23) Me.label3.TabIndex = 8 Me.label3.Text = "Hours" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'udcFromHours ' - Me.udcFromHours.Location = New System.Drawing.Point(136, 104) + Me.udcFromHours.Location = New System.Drawing.Point(174, 104) Me.udcFromHours.Maximum = New Decimal(New Integer() {23, 0, 0, 0}) Me.udcFromHours.Minimum = New Decimal(New Integer() {23, 0, 0, -2147483648}) Me.udcFromHours.Name = "udcFromHours" - Me.udcFromHours.Size = New System.Drawing.Size(48, 22) + Me.udcFromHours.Size = New System.Drawing.Size(60, 26) Me.udcFromHours.TabIndex = 7 Me.udcFromHours.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'label2 ' Me.label2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.label2.Location = New System.Drawing.Point(32, 103) + Me.label2.Location = New System.Drawing.Point(35, 105) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(96, 23) + Me.label2.Size = New System.Drawing.Size(133, 23) Me.label2.TabIndex = 6 Me.label2.Text = "Offset From" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -248,16 +248,16 @@ Partial Class ObservanceRuleControl Me.dtpStartDate.Checked = false Me.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpStartDate.Location = New System.Drawing.Point(312, 26) + Me.dtpStartDate.Location = New System.Drawing.Point(394, 24) Me.dtpStartDate.Name = "dtpStartDate" - Me.dtpStartDate.Size = New System.Drawing.Size(190, 22) + Me.dtpStartDate.Size = New System.Drawing.Size(235, 26) Me.dtpStartDate.TabIndex = 3 ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(256, 24) + Me.label1.Location = New System.Drawing.Point(325, 26) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(50, 23) + Me.label1.Size = New System.Drawing.Size(63, 23) Me.label1.TabIndex = 2 Me.label1.Text = "&Start" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -265,9 +265,9 @@ Partial Class ObservanceRuleControl 'pgRules ' Me.pgRules.Controls.Add(Me.rcRulesDates) - Me.pgRules.Location = New System.Drawing.Point(4, 25) + Me.pgRules.Location = New System.Drawing.Point(4, 29) Me.pgRules.Name = "pgRules" - Me.pgRules.Size = New System.Drawing.Size(544, 286) + Me.pgRules.Size = New System.Drawing.Size(686, 322) Me.pgRules.TabIndex = 1 Me.pgRules.Text = "Rules" Me.pgRules.UseVisualStyleBackColor = true @@ -277,14 +277,14 @@ Partial Class ObservanceRuleControl Me.rcRulesDates.Dock = System.Windows.Forms.DockStyle.Fill Me.rcRulesDates.Location = New System.Drawing.Point(0, 0) Me.rcRulesDates.Name = "rcRulesDates" - Me.rcRulesDates.Size = New System.Drawing.Size(544, 286) + Me.rcRulesDates.Size = New System.Drawing.Size(686, 322) Me.rcRulesDates.TabIndex = 0 ' 'ObservanceRuleControl ' Me.Controls.Add(Me.tabTimeZone) Me.Name = "ObservanceRuleControl" - Me.Size = New System.Drawing.Size(568, 344) + Me.Size = New System.Drawing.Size(701, 390) Me.Controls.SetChildIndex(Me.tabTimeZone, 0) Me.tabTimeZone.ResumeLayout(false) Me.pgGeneral.ResumeLayout(false) diff --git a/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.vb b/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.vb index 5ee9b58..6f8a8a4 100644 --- a/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.vb +++ b/Source/VBNetDemos/CalendarBrowser/ObservanceRuleControl.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : ObservanceRuleControl.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 01/05/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This is used to edit a VTimeZone object's observance rule collection @@ -19,7 +19,6 @@ ' 05/21/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System Imports System.Collections.Generic Imports System.ComponentModel Imports System.Globalization @@ -27,7 +26,6 @@ Imports System.Windows.Forms Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects -Imports EWSoftware.PDI.Windows.Forms ''' ''' This is used to edit the Observance Rule property collection @@ -42,9 +40,10 @@ Public Partial Class ObservanceRuleControl InitializeComponent() - Dim rules As New List(Of ListItem)() - rules.Add(New ListItem(ObservanceRuleType.Standard, "Standard")) - rules.Add(New ListItem(ObservanceRuleType.Daylight, "Daylight")) + Dim rules As New List(Of ListItem) From { + New ListItem(ObservanceRuleType.Standard, "Standard"), + New ListItem(ObservanceRuleType.Daylight, "Daylight") + } cboRuleType.ValueMember = "Value" cboRuleType.DisplayMember = "Display" diff --git a/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.Designer.vb b/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.Designer.vb index 18411c9..d4eccaa 100644 --- a/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.Designer.vb @@ -41,27 +41,27 @@ Partial Class RecurrenceControl 'btnClearRRules ' Me.btnClearRRules.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearRRules.Location = New System.Drawing.Point(251, 248) + Me.btnClearRRules.Location = New System.Drawing.Point(285, 282) Me.btnClearRRules.Name = "btnClearRRules" - Me.btnClearRRules.Size = New System.Drawing.Size(75, 28) + Me.btnClearRRules.Size = New System.Drawing.Size(88, 32) Me.btnClearRRules.TabIndex = 5 Me.btnClearRRules.Text = "Clear" ' 'btnRemoveRRule ' Me.btnRemoveRRule.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnRemoveRRule.Location = New System.Drawing.Point(170, 248) + Me.btnRemoveRRule.Location = New System.Drawing.Point(191, 282) Me.btnRemoveRRule.Name = "btnRemoveRRule" - Me.btnRemoveRRule.Size = New System.Drawing.Size(75, 28) + Me.btnRemoveRRule.Size = New System.Drawing.Size(88, 32) Me.btnRemoveRRule.TabIndex = 4 Me.btnRemoveRRule.Text = "Remove" ' 'btnAddRRule ' Me.btnAddRRule.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddRRule.Location = New System.Drawing.Point(8, 248) + Me.btnAddRRule.Location = New System.Drawing.Point(3, 282) Me.btnAddRRule.Name = "btnAddRRule" - Me.btnAddRRule.Size = New System.Drawing.Size(75, 28) + Me.btnAddRRule.Size = New System.Drawing.Size(88, 32) Me.btnAddRRule.TabIndex = 2 Me.btnAddRRule.Text = "Add" ' @@ -69,50 +69,52 @@ Partial Class RecurrenceControl ' Me.lbRRules.HorizontalExtent = 800 Me.lbRRules.HorizontalScrollbar = true - Me.lbRRules.ItemHeight = 16 - Me.lbRRules.Location = New System.Drawing.Point(8, 32) + Me.lbRRules.IntegralHeight = false + Me.lbRRules.ItemHeight = 20 + Me.lbRRules.Location = New System.Drawing.Point(3, 34) Me.lbRRules.Name = "lbRRules" - Me.lbRRules.Size = New System.Drawing.Size(320, 212) + Me.lbRRules.Size = New System.Drawing.Size(370, 242) Me.lbRRules.TabIndex = 1 ' 'btnClearRDates ' Me.btnClearRDates.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearRDates.Location = New System.Drawing.Point(347, 248) + Me.btnClearRDates.Location = New System.Drawing.Point(584, 282) Me.btnClearRDates.Name = "btnClearRDates" - Me.btnClearRDates.Size = New System.Drawing.Size(75, 28) + Me.btnClearRDates.Size = New System.Drawing.Size(88, 32) Me.btnClearRDates.TabIndex = 13 Me.btnClearRDates.Text = "Clear" ' 'btnRemoveRDate ' Me.btnRemoveRDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnRemoveRDate.Location = New System.Drawing.Point(447, 218) + Me.btnRemoveRDate.Location = New System.Drawing.Point(490, 282) Me.btnRemoveRDate.Name = "btnRemoveRDate" - Me.btnRemoveRDate.Size = New System.Drawing.Size(75, 28) + Me.btnRemoveRDate.Size = New System.Drawing.Size(88, 32) Me.btnRemoveRDate.TabIndex = 12 Me.btnRemoveRDate.Text = "Remove" ' 'btnAddRDate ' Me.btnAddRDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddRDate.Location = New System.Drawing.Point(346, 218) + Me.btnAddRDate.Location = New System.Drawing.Point(396, 282) Me.btnAddRDate.Name = "btnAddRDate" - Me.btnAddRDate.Size = New System.Drawing.Size(75, 28) + Me.btnAddRDate.Size = New System.Drawing.Size(88, 32) Me.btnAddRDate.TabIndex = 11 Me.btnAddRDate.Text = "Add" ' 'lbRDates ' - Me.lbRDates.ItemHeight = 16 - Me.lbRDates.Location = New System.Drawing.Point(346, 80) + Me.lbRDates.IntegralHeight = false + Me.lbRDates.ItemHeight = 20 + Me.lbRDates.Location = New System.Drawing.Point(396, 96) Me.lbRDates.Name = "lbRDates" - Me.lbRDates.Size = New System.Drawing.Size(176, 132) + Me.lbRDates.Size = New System.Drawing.Size(276, 180) Me.lbRDates.TabIndex = 10 ' 'lblRRules ' - Me.lblRRules.Location = New System.Drawing.Point(8, 8) + Me.lblRRules.Location = New System.Drawing.Point(3, 8) Me.lblRRules.Name = "lblRRules" Me.lblRRules.Size = New System.Drawing.Size(216, 23) Me.lblRRules.TabIndex = 0 @@ -121,7 +123,7 @@ Partial Class RecurrenceControl ' 'lblRDates ' - Me.lblRDates.Location = New System.Drawing.Point(346, 8) + Me.lblRDates.Location = New System.Drawing.Point(397, 8) Me.lblRDates.Name = "lblRDates" Me.lblRDates.Size = New System.Drawing.Size(174, 23) Me.lblRDates.TabIndex = 7 @@ -133,33 +135,33 @@ Partial Class RecurrenceControl Me.dtpRDate.Checked = false Me.dtpRDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpRDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpRDate.Location = New System.Drawing.Point(346, 32) + Me.dtpRDate.Location = New System.Drawing.Point(395, 34) Me.dtpRDate.Name = "dtpRDate" - Me.dtpRDate.Size = New System.Drawing.Size(190, 22) + Me.dtpRDate.Size = New System.Drawing.Size(235, 26) Me.dtpRDate.TabIndex = 8 ' 'btnEditRRule ' Me.btnEditRRule.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnEditRRule.Location = New System.Drawing.Point(89, 248) + Me.btnEditRRule.Location = New System.Drawing.Point(97, 282) Me.btnEditRRule.Name = "btnEditRRule" - Me.btnEditRRule.Size = New System.Drawing.Size(75, 28) + Me.btnEditRRule.Size = New System.Drawing.Size(88, 32) Me.btnEditRRule.TabIndex = 3 Me.btnEditRRule.Text = "Edit" ' 'groupBox1 ' - Me.groupBox1.Location = New System.Drawing.Point(336, 8) + Me.groupBox1.Location = New System.Drawing.Point(387, 8) Me.groupBox1.Name = "groupBox1" - Me.groupBox1.Size = New System.Drawing.Size(2, 270) + Me.groupBox1.Size = New System.Drawing.Size(2, 300) Me.groupBox1.TabIndex = 6 Me.groupBox1.TabStop = false ' 'chkExcludeDay ' - Me.chkExcludeDay.Location = New System.Drawing.Point(347, 56) + Me.chkExcludeDay.Location = New System.Drawing.Point(393, 66) Me.chkExcludeDay.Name = "chkExcludeDay" - Me.chkExcludeDay.Size = New System.Drawing.Size(152, 24) + Me.chkExcludeDay.Size = New System.Drawing.Size(201, 24) Me.chkExcludeDay.TabIndex = 9 Me.chkExcludeDay.Text = "Exclude whole day" ' @@ -180,7 +182,7 @@ Partial Class RecurrenceControl Me.Controls.Add(Me.btnAddRRule) Me.Controls.Add(Me.lbRRules) Me.Name = "RecurrenceControl" - Me.Size = New System.Drawing.Size(542, 286) + Me.Size = New System.Drawing.Size(685, 320) Me.ResumeLayout(false) End Sub diff --git a/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.vb b/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.vb index 8debfb1..1f47cda 100644 --- a/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.vb +++ b/Source/VBNetDemos/CalendarBrowser/RecurrenceControl.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : RecurrenceControl.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 01/05/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This is used to edit a recurring calendar object's recurrence rule and recurrence date properties @@ -18,11 +18,8 @@ ' 12/09/2004 EFW Created the code '================================================================================================================ -Imports System Imports System.ComponentModel -Imports System.Drawing Imports System.Globalization -Imports System.Windows.Forms Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects @@ -140,10 +137,12 @@ Public Partial Class RecurrenceControl ' Convert the exception dates to RDate format internally For Each edate In ed - rd = New RDateProperty() - rd.ValueLocation = edate.ValueLocation - rd.TimeZoneId = edate.TimeZoneId - rd.TimeZoneDateTime = edate.TimeZoneDateTime + rd = New RDateProperty With { + .ValueLocation = edate.ValueLocation, + .TimeZoneId = edate.TimeZoneId, + .TimeZoneDateTime = edate.TimeZoneDateTime + } + rDates.Add(rd) Next @@ -196,10 +195,12 @@ Public Partial Class RecurrenceControl ' Convert the RDates to ExDate format For Each rdate In rDates - edate = New ExDateProperty() - edate.ValueLocation = rdate.ValueLocation - edate.TimeZoneId = rdate.TimeZoneId - edate.TimeZoneDateTime = rdate.TimeZoneDateTime + edate = New ExDateProperty With { + .ValueLocation = rdate.ValueLocation, + .TimeZoneId = rdate.TimeZoneId, + .TimeZoneDateTime = rdate.TimeZoneDateTime + } + ed.Add(edate) Next End Sub @@ -328,14 +329,18 @@ Public Partial Class RecurrenceControl ' Add a recurrence date to the collection and the list box. If "Exclude whole day" is checked, the time ' part is omitted. If chkExcludeDay.Checked = True Then - Dim rdate As New RDateProperty() - rdate.ValueLocation = ValLocValue.Date - rdate.TimeZoneDateTime = dtpRDate.Value.Date + Dim rdate As New RDateProperty With { + .ValueLocation = ValLocValue.Date, + .TimeZoneDateTime = dtpRDate.Value.Date + } + rDates.Add(rdate) lbRDates.Items.Add(dtpRDate.Value.Date.ToString("d")) Else - Dim rdate As New RDateProperty() - rdate.TimeZoneDateTime = dtpRDate.Value + Dim rdate As New RDateProperty With { + .TimeZoneDateTime = dtpRDate.Value + } + rDates.Add(rdate) lbRDates.Items.Add(dtpRDate.Value.ToString("G")) End If diff --git a/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.Designer.vb b/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.Designer.vb index c89ff99..1b977fd 100644 --- a/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.Designer.vb @@ -32,48 +32,48 @@ Partial Class RequestStatusControl ' 'txtStatusCode ' - Me.txtStatusCode.Location = New System.Drawing.Point(120, 8) + Me.txtStatusCode.Location = New System.Drawing.Point(152, 8) Me.txtStatusCode.Name = "txtStatusCode" - Me.txtStatusCode.Size = New System.Drawing.Size(128, 22) + Me.txtStatusCode.Size = New System.Drawing.Size(156, 26) Me.txtStatusCode.TabIndex = 1 ' 'label5 ' - Me.label5.Location = New System.Drawing.Point(26, 8) + Me.label5.Location = New System.Drawing.Point(35, 10) Me.label5.Name = "label5" - Me.label5.Size = New System.Drawing.Size(88, 23) + Me.label5.Size = New System.Drawing.Size(111, 23) Me.label5.TabIndex = 0 Me.label5.Text = "Status Code" Me.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtMessage ' - Me.txtMessage.Location = New System.Drawing.Point(120, 40) + Me.txtMessage.Location = New System.Drawing.Point(152, 40) Me.txtMessage.Name = "txtMessage" - Me.txtMessage.Size = New System.Drawing.Size(264, 22) + Me.txtMessage.Size = New System.Drawing.Size(292, 26) Me.txtMessage.TabIndex = 3 ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(29, 40) + Me.label1.Location = New System.Drawing.Point(29, 42) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(85, 23) + Me.label1.Size = New System.Drawing.Size(117, 23) Me.label1.TabIndex = 2 Me.label1.Text = "Message" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtExtData ' - Me.txtExtData.Location = New System.Drawing.Point(120, 72) + Me.txtExtData.Location = New System.Drawing.Point(152, 72) Me.txtExtData.Name = "txtExtData" - Me.txtExtData.Size = New System.Drawing.Size(264, 22) + Me.txtExtData.Size = New System.Drawing.Size(292, 26) Me.txtExtData.TabIndex = 5 ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(4, 72) + Me.label2.Location = New System.Drawing.Point(3, 74) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(110, 23) + Me.label2.Size = New System.Drawing.Size(143, 23) Me.label2.TabIndex = 4 Me.label2.Text = "Extended Data" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -87,7 +87,7 @@ Partial Class RequestStatusControl Me.Controls.Add(Me.txtStatusCode) Me.Controls.Add(Me.label5) Me.Name = "RequestStatusControl" - Me.Size = New System.Drawing.Size(400, 136) + Me.Size = New System.Drawing.Size(458, 136) Me.Controls.SetChildIndex(Me.label5, 0) Me.Controls.SetChildIndex(Me.txtStatusCode, 0) Me.Controls.SetChildIndex(Me.label1, 0) diff --git a/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.vb b/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.vb index 8ba50ab..a19d57b 100644 --- a/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.vb +++ b/Source/VBNetDemos/CalendarBrowser/RequestStatusControl.vb @@ -19,14 +19,9 @@ ' 05/25/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System Imports System.ComponentModel -Imports System.Drawing -Imports System.Windows.Forms -Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms ''' ''' This is used to edit the Request Status property collection diff --git a/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.Designer.vb b/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.Designer.vb index 5b36124..bfc7e4b 100644 --- a/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.Designer.vb @@ -69,7 +69,7 @@ Partial Class TimeZoneListDlg Me.chkLimitToCalendar.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.chkLimitToCalendar.Location = New System.Drawing.Point(12, 486) Me.chkLimitToCalendar.Name = "chkLimitToCalendar" - Me.chkLimitToCalendar.Size = New System.Drawing.Size(345, 24) + Me.chkLimitToCalendar.Size = New System.Drawing.Size(467, 24) Me.chkLimitToCalendar.TabIndex = 1 Me.chkLimitToCalendar.Text = "&Limit to time zones used in the loaded calendar" ' diff --git a/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.vb b/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.vb index 2464c07..51c6338 100644 --- a/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.vb +++ b/Source/VBNetDemos/CalendarBrowser/TimeZoneListDlg.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : TimeZoneListDlg.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 01/05/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This is used to edit view and edit time zones and apply them to the calendar @@ -19,11 +19,7 @@ ' 05/21/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System -Imports System.Drawing -Imports System.ComponentModel Imports System.Globalization -Imports System.Windows.Forms Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects @@ -34,9 +30,7 @@ Imports EWSoftware.PDI.Objects Public Partial Class TimeZoneListDlg Inherits System.Windows.Forms.Form - Private vCal As VCalendar Private timeZones As VTimeZoneCollection - Private wasModified As Boolean Public Sub New() MyBase.New() @@ -47,7 +41,7 @@ Public Partial Class TimeZoneListDlg tbcLastModified.DefaultCellStyle.Format = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern & " " & CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern - vCal = Nothing + Me.CurrentCalendar = Nothing timeZones = New VTimeZoneCollection() LoadGridWithItems() End Sub @@ -56,25 +50,11 @@ Public Partial Class TimeZoneListDlg ''' Get or set the currently loaded calendar ''' Public Property CurrentCalendar As VCalendar - Get - Return vCal - End Get - Set - vCal = Value - End Set - End Property ''' ''' Set or get the modified state ''' Public Property Modified As Boolean - Get - Return wasModified - End Get - Set - wasModified = Value - End Set - End Property ''' ''' Load the grid with the specified calendar items @@ -91,8 +71,8 @@ Public Partial Class TimeZoneListDlg ' Get just the time zones used Dim timeZonesUsed As New StringCollection() - If vCal IsNot Nothing Then - vCal.TimeZonesUsed(timeZonesUsed) + If Me.CurrentCalendar IsNot Nothing Then + Me.CurrentCalendar.TimeZonesUsed(timeZonesUsed) ' Remove entries that don't exist idx = 0 @@ -160,7 +140,7 @@ Public Partial Class TimeZoneListDlg dlg.GetValues(tz) VCalendar.TimeZones.Add(tz) - wasModified = True + Me.Modified = True LoadGridWithItems() End If End Using @@ -185,7 +165,7 @@ Public Partial Class TimeZoneListDlg If dlg.ShowDialog() = System.Windows.Forms.DialogResult.OK Then dlg.GetValues(VCalendar.TimeZones(timeZoneId)) - wasModified = True + Me.Modified = True LoadGridWithItems() End If End Using @@ -207,8 +187,8 @@ Public Partial Class TimeZoneListDlg Dim timeZonesUsed As New StringCollection() Dim timeZoneId As String = CType(dgvCalendar(0, dgvCalendar.CurrentCellAddress.Y).Value, String) - If Not (vCal Is Nothing) Then - vCal.TimeZonesUsed(timeZonesUsed) + If Not (Me.CurrentCalendar Is Nothing) Then + Me.CurrentCalendar.TimeZonesUsed(timeZonesUsed) End If If timeZonesUsed.Contains(timeZoneId) Then @@ -221,7 +201,7 @@ Public Partial Class TimeZoneListDlg MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = System.Windows.Forms.DialogResult.Yes Then VCalendar.TimeZones.Remove(VCalendar.TimeZones(timeZoneId)) - wasModified = True + Me.Modified = True LoadGridWithItems() End If End Sub @@ -243,8 +223,8 @@ Public Partial Class TimeZoneListDlg "Apply Time Zone", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = System.Windows.Forms.DialogResult.Yes Then Dim timeZoneId As String = CType(dgvCalendar(0, dgvCalendar.CurrentCellAddress.Y).Value, String) - vCal.ApplyTimeZone(VCalendar.TimeZones(timeZoneId)) - wasModified = True + Me.CurrentCalendar.ApplyTimeZone(VCalendar.TimeZones(timeZoneId)) + Me.Modified = True End If End Sub End Class diff --git a/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.Designer.vb b/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.Designer.vb index ce4f438..4fed4df 100644 --- a/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.Designer.vb @@ -63,18 +63,18 @@ Partial Class VFreeBusyDlg ' 'txtUniqueId ' - Me.txtUniqueId.Location = New System.Drawing.Point(96, 12) + Me.txtUniqueId.Location = New System.Drawing.Point(141, 12) Me.txtUniqueId.Name = "txtUniqueId" Me.txtUniqueId.ReadOnly = true - Me.txtUniqueId.Size = New System.Drawing.Size(380, 22) + Me.txtUniqueId.Size = New System.Drawing.Size(380, 26) Me.txtUniqueId.TabIndex = 1 Me.txtUniqueId.TabStop = false ' 'label9 ' - Me.label9.Location = New System.Drawing.Point(14, 12) + Me.label9.Location = New System.Drawing.Point(32, 14) Me.label9.Name = "label9" - Me.label9.Size = New System.Drawing.Size(76, 23) + Me.label9.Size = New System.Drawing.Size(103, 23) Me.label9.TabIndex = 0 Me.label9.Text = "Unique ID" Me.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -85,10 +85,10 @@ Partial Class VFreeBusyDlg Me.tabInfo.Controls.Add(Me.pgAttendees) Me.tabInfo.Controls.Add(Me.pgFreeBusy) Me.tabInfo.Controls.Add(Me.pgReqStats) - Me.tabInfo.Location = New System.Drawing.Point(12, 138) + Me.tabInfo.Location = New System.Drawing.Point(12, 149) Me.tabInfo.Name = "tabInfo" Me.tabInfo.SelectedIndex = 0 - Me.tabInfo.Size = New System.Drawing.Size(599, 256) + Me.tabInfo.Size = New System.Drawing.Size(742, 297) Me.tabInfo.TabIndex = 9 ' 'pgGeneral @@ -103,27 +103,27 @@ Partial Class VFreeBusyDlg Me.pgGeneral.Controls.Add(Me.label17) Me.pgGeneral.Controls.Add(Me.txtUrl) Me.pgGeneral.Controls.Add(Me.label3) - Me.pgGeneral.Location = New System.Drawing.Point(4, 25) + Me.pgGeneral.Location = New System.Drawing.Point(4, 29) Me.pgGeneral.Name = "pgGeneral" - Me.pgGeneral.Size = New System.Drawing.Size(591, 227) + Me.pgGeneral.Size = New System.Drawing.Size(734, 264) Me.pgGeneral.TabIndex = 3 Me.pgGeneral.Text = "General" Me.pgGeneral.UseVisualStyleBackColor = true ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(312, 16) + Me.label2.Location = New System.Drawing.Point(391, 16) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(40, 23) + Me.label2.Size = New System.Drawing.Size(54, 23) Me.label2.TabIndex = 2 Me.label2.Text = "End" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtDuration ' - Me.txtDuration.Location = New System.Drawing.Point(96, 56) + Me.txtDuration.Location = New System.Drawing.Point(116, 56) Me.txtDuration.Name = "txtDuration" - Me.txtDuration.Size = New System.Drawing.Size(108, 22) + Me.txtDuration.Size = New System.Drawing.Size(116, 26) Me.txtDuration.TabIndex = 5 ' 'dtpEndDate @@ -131,10 +131,10 @@ Partial Class VFreeBusyDlg Me.dtpEndDate.Checked = false Me.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpEndDate.Location = New System.Drawing.Point(358, 16) + Me.dtpEndDate.Location = New System.Drawing.Point(451, 16) Me.dtpEndDate.Name = "dtpEndDate" Me.dtpEndDate.ShowCheckBox = true - Me.dtpEndDate.Size = New System.Drawing.Size(210, 22) + Me.dtpEndDate.Size = New System.Drawing.Size(255, 26) Me.dtpEndDate.TabIndex = 3 ' 'dtpStartDate @@ -142,26 +142,26 @@ Partial Class VFreeBusyDlg Me.dtpStartDate.Checked = false Me.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpStartDate.Location = New System.Drawing.Point(96, 16) + Me.dtpStartDate.Location = New System.Drawing.Point(116, 16) Me.dtpStartDate.Name = "dtpStartDate" Me.dtpStartDate.ShowCheckBox = true - Me.dtpStartDate.Size = New System.Drawing.Size(210, 22) + Me.dtpStartDate.Size = New System.Drawing.Size(255, 26) Me.dtpStartDate.TabIndex = 1 ' 'label4 ' - Me.label4.Location = New System.Drawing.Point(15, 56) + Me.label4.Location = New System.Drawing.Point(16, 58) Me.label4.Name = "label4" - Me.label4.Size = New System.Drawing.Size(75, 23) + Me.label4.Size = New System.Drawing.Size(94, 23) Me.label4.TabIndex = 4 Me.label4.Text = "Duration" Me.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(40, 16) + Me.label1.Location = New System.Drawing.Point(41, 16) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(50, 23) + Me.label1.Size = New System.Drawing.Size(69, 23) Me.label1.TabIndex = 0 Me.label1.Text = "&Start" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -169,34 +169,34 @@ Partial Class VFreeBusyDlg 'txtComments ' Me.txtComments.AcceptsReturn = true - Me.txtComments.Location = New System.Drawing.Point(96, 136) + Me.txtComments.Location = New System.Drawing.Point(116, 136) Me.txtComments.Multiline = true Me.txtComments.Name = "txtComments" Me.txtComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtComments.Size = New System.Drawing.Size(424, 72) + Me.txtComments.Size = New System.Drawing.Size(590, 110) Me.txtComments.TabIndex = 9 ' 'label17 ' - Me.label17.Location = New System.Drawing.Point(10, 136) + Me.label17.Location = New System.Drawing.Point(10, 138) Me.label17.Name = "label17" - Me.label17.Size = New System.Drawing.Size(80, 23) + Me.label17.Size = New System.Drawing.Size(100, 23) Me.label17.TabIndex = 8 Me.label17.Text = "&Comments" Me.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtUrl ' - Me.txtUrl.Location = New System.Drawing.Point(96, 96) + Me.txtUrl.Location = New System.Drawing.Point(116, 96) Me.txtUrl.Name = "txtUrl" - Me.txtUrl.Size = New System.Drawing.Size(424, 22) + Me.txtUrl.Size = New System.Drawing.Size(590, 26) Me.txtUrl.TabIndex = 7 ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(50, 96) + Me.label3.Location = New System.Drawing.Point(47, 98) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(40, 23) + Me.label3.Size = New System.Drawing.Size(63, 23) Me.label3.TabIndex = 6 Me.label3.Text = "&URL" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -204,82 +204,82 @@ Partial Class VFreeBusyDlg 'pgAttendees ' Me.pgAttendees.Controls.Add(Me.ucAttendees) - Me.pgAttendees.Location = New System.Drawing.Point(4, 25) + Me.pgAttendees.Location = New System.Drawing.Point(4, 29) Me.pgAttendees.Name = "pgAttendees" - Me.pgAttendees.Size = New System.Drawing.Size(591, 227) + Me.pgAttendees.Size = New System.Drawing.Size(734, 264) Me.pgAttendees.TabIndex = 0 Me.pgAttendees.Text = "Attendees" Me.pgAttendees.UseVisualStyleBackColor = true ' 'ucAttendees ' - Me.ucAttendees.Location = New System.Drawing.Point(47, 5) + Me.ucAttendees.Location = New System.Drawing.Point(90, 25) Me.ucAttendees.Name = "ucAttendees" - Me.ucAttendees.Size = New System.Drawing.Size(496, 216) + Me.ucAttendees.Size = New System.Drawing.Size(554, 214) Me.ucAttendees.TabIndex = 0 ' 'pgFreeBusy ' Me.pgFreeBusy.Controls.Add(Me.ucFreeBusy) - Me.pgFreeBusy.Location = New System.Drawing.Point(4, 25) + Me.pgFreeBusy.Location = New System.Drawing.Point(4, 29) Me.pgFreeBusy.Name = "pgFreeBusy" - Me.pgFreeBusy.Size = New System.Drawing.Size(591, 227) + Me.pgFreeBusy.Size = New System.Drawing.Size(734, 264) Me.pgFreeBusy.TabIndex = 1 Me.pgFreeBusy.Text = "Free/Busy" Me.pgFreeBusy.UseVisualStyleBackColor = true ' 'ucFreeBusy ' - Me.ucFreeBusy.Location = New System.Drawing.Point(76, 37) + Me.ucFreeBusy.Location = New System.Drawing.Point(105, 50) Me.ucFreeBusy.Name = "ucFreeBusy" - Me.ucFreeBusy.Size = New System.Drawing.Size(438, 152) + Me.ucFreeBusy.Size = New System.Drawing.Size(525, 164) Me.ucFreeBusy.TabIndex = 0 ' 'pgReqStats ' Me.pgReqStats.Controls.Add(Me.ucRequestStatus) - Me.pgReqStats.Location = New System.Drawing.Point(4, 25) + Me.pgReqStats.Location = New System.Drawing.Point(4, 29) Me.pgReqStats.Name = "pgReqStats" - Me.pgReqStats.Size = New System.Drawing.Size(591, 227) + Me.pgReqStats.Size = New System.Drawing.Size(734, 264) Me.pgReqStats.TabIndex = 2 Me.pgReqStats.Text = "Request Status" Me.pgReqStats.UseVisualStyleBackColor = true ' 'ucRequestStatus ' - Me.ucRequestStatus.Location = New System.Drawing.Point(87, 41) + Me.ucRequestStatus.Location = New System.Drawing.Point(110, 56) Me.ucRequestStatus.Name = "ucRequestStatus" - Me.ucRequestStatus.Size = New System.Drawing.Size(416, 144) + Me.ucRequestStatus.Size = New System.Drawing.Size(514, 152) Me.ucRequestStatus.TabIndex = 0 ' 'txtOrganizer ' - Me.txtOrganizer.Location = New System.Drawing.Point(96, 72) + Me.txtOrganizer.Location = New System.Drawing.Point(141, 83) Me.txtOrganizer.Name = "txtOrganizer" - Me.txtOrganizer.Size = New System.Drawing.Size(437, 22) + Me.txtOrganizer.Size = New System.Drawing.Size(572, 26) Me.txtOrganizer.TabIndex = 6 ' 'label5 ' - Me.label5.Location = New System.Drawing.Point(18, 72) + Me.label5.Location = New System.Drawing.Point(22, 83) Me.label5.Name = "label5" - Me.label5.Size = New System.Drawing.Size(72, 23) + Me.label5.Size = New System.Drawing.Size(113, 23) Me.label5.TabIndex = 5 Me.label5.Text = "&Organizer" Me.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtContact ' - Me.txtContact.Location = New System.Drawing.Point(96, 104) + Me.txtContact.Location = New System.Drawing.Point(141, 115) Me.txtContact.Name = "txtContact" - Me.txtContact.Size = New System.Drawing.Size(437, 22) + Me.txtContact.Size = New System.Drawing.Size(572, 26) Me.txtContact.TabIndex = 8 ' 'label6 ' - Me.label6.Location = New System.Drawing.Point(26, 104) + Me.label6.Location = New System.Drawing.Point(22, 115) Me.label6.Name = "label6" - Me.label6.Size = New System.Drawing.Size(64, 23) + Me.label6.Size = New System.Drawing.Size(113, 23) Me.label6.TabIndex = 7 Me.label6.Text = "Contact" Me.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -288,7 +288,7 @@ Partial Class VFreeBusyDlg ' Me.btnCancel.CausesValidation = false Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(523, 400) + Me.btnCancel.Location = New System.Drawing.Point(666, 452) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(88, 32) Me.btnCancel.TabIndex = 11 @@ -297,7 +297,7 @@ Partial Class VFreeBusyDlg 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(12, 400) + Me.btnOK.Location = New System.Drawing.Point(12, 452) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(88, 32) Me.btnOK.TabIndex = 10 @@ -309,9 +309,9 @@ Partial Class VFreeBusyDlg ' 'label7 ' - Me.label7.Location = New System.Drawing.Point(8, 40) + Me.label7.Location = New System.Drawing.Point(18, 49) Me.label7.Name = "label7" - Me.label7.Size = New System.Drawing.Size(82, 23) + Me.label7.Size = New System.Drawing.Size(117, 23) Me.label7.TabIndex = 2 Me.label7.Text = "&Time Zone" Me.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -319,15 +319,15 @@ Partial Class VFreeBusyDlg 'cboTimeZone ' Me.cboTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboTimeZone.Location = New System.Drawing.Point(96, 40) + Me.cboTimeZone.Location = New System.Drawing.Point(141, 49) Me.cboTimeZone.MaxDropDownItems = 16 Me.cboTimeZone.Name = "cboTimeZone" - Me.cboTimeZone.Size = New System.Drawing.Size(437, 24) + Me.cboTimeZone.Size = New System.Drawing.Size(502, 28) Me.cboTimeZone.TabIndex = 3 ' 'btnApplyTZ ' - Me.btnApplyTZ.Location = New System.Drawing.Point(539, 38) + Me.btnApplyTZ.Location = New System.Drawing.Point(649, 48) Me.btnApplyTZ.Name = "btnApplyTZ" Me.btnApplyTZ.Size = New System.Drawing.Size(64, 28) Me.btnApplyTZ.TabIndex = 4 @@ -337,7 +337,7 @@ Partial Class VFreeBusyDlg ' Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnCancel - Me.ClientSize = New System.Drawing.Size(623, 444) + Me.ClientSize = New System.Drawing.Size(766, 496) Me.Controls.Add(Me.btnApplyTZ) Me.Controls.Add(Me.label7) Me.Controls.Add(Me.cboTimeZone) diff --git a/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.vb b/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.vb index 4e6a95a..7d84122 100644 --- a/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.vb +++ b/Source/VBNetDemos/CalendarBrowser/VFreeBusyDlg.vb @@ -19,10 +19,7 @@ ' 05/25/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System -Imports System.ComponentModel Imports System.Globalization -Imports System.Windows.Forms Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects diff --git a/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.Designer.vb b/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.Designer.vb index e885afe..f889bbc 100644 --- a/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.Designer.vb +++ b/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.Designer.vb @@ -41,7 +41,7 @@ Partial Class VTimeZoneDlg 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(12, 493) + Me.btnOK.Location = New System.Drawing.Point(12, 575) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(88, 32) Me.btnOK.TabIndex = 7 @@ -51,7 +51,7 @@ Partial Class VTimeZoneDlg ' Me.btnCancel.CausesValidation = false Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(502, 493) + Me.btnCancel.Location = New System.Drawing.Point(652, 575) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(88, 32) Me.btnCancel.TabIndex = 8 @@ -59,7 +59,7 @@ Partial Class VTimeZoneDlg ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(17, 12) + Me.label1.Location = New System.Drawing.Point(38, 14) Me.label1.Name = "label1" Me.label1.Size = New System.Drawing.Size(106, 23) Me.label1.TabIndex = 0 @@ -68,41 +68,41 @@ Partial Class VTimeZoneDlg ' 'txtTimeZoneId ' - Me.txtTimeZoneId.Location = New System.Drawing.Point(129, 8) + Me.txtTimeZoneId.Location = New System.Drawing.Point(150, 12) Me.txtTimeZoneId.Name = "txtTimeZoneId" - Me.txtTimeZoneId.Size = New System.Drawing.Size(448, 22) + Me.txtTimeZoneId.Size = New System.Drawing.Size(570, 26) Me.txtTimeZoneId.TabIndex = 1 ' 'txtTimeZoneUrl ' - Me.txtTimeZoneUrl.Location = New System.Drawing.Point(129, 40) + Me.txtTimeZoneUrl.Location = New System.Drawing.Point(150, 44) Me.txtTimeZoneUrl.Name = "txtTimeZoneUrl" - Me.txtTimeZoneUrl.Size = New System.Drawing.Size(448, 22) + Me.txtTimeZoneUrl.Size = New System.Drawing.Size(570, 26) Me.txtTimeZoneUrl.TabIndex = 3 ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(9, 40) + Me.label2.Location = New System.Drawing.Point(12, 46) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(114, 23) + Me.label2.Size = New System.Drawing.Size(132, 23) Me.label2.TabIndex = 2 Me.label2.Text = "Time Zone &URL" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtLastModified ' - Me.txtLastModified.Location = New System.Drawing.Point(129, 72) + Me.txtLastModified.Location = New System.Drawing.Point(150, 76) Me.txtLastModified.Name = "txtLastModified" Me.txtLastModified.ReadOnly = true - Me.txtLastModified.Size = New System.Drawing.Size(168, 22) + Me.txtLastModified.Size = New System.Drawing.Size(207, 26) Me.txtLastModified.TabIndex = 5 Me.txtLastModified.TabStop = false ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(19, 72) + Me.label3.Location = New System.Drawing.Point(16, 78) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(104, 23) + Me.label3.Size = New System.Drawing.Size(128, 23) Me.label3.TabIndex = 4 Me.label3.Text = "Last Modified" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -110,18 +110,18 @@ Partial Class VTimeZoneDlg 'grpObRules ' Me.grpObRules.Controls.Add(Me.ucRules) - Me.grpObRules.Location = New System.Drawing.Point(12, 104) + Me.grpObRules.Location = New System.Drawing.Point(12, 121) Me.grpObRules.Name = "grpObRules" - Me.grpObRules.Size = New System.Drawing.Size(578, 383) + Me.grpObRules.Size = New System.Drawing.Size(728, 448) Me.grpObRules.TabIndex = 6 Me.grpObRules.TabStop = false Me.grpObRules.Text = "Observance Rules" ' 'ucRules ' - Me.ucRules.Location = New System.Drawing.Point(5, 28) + Me.ucRules.Location = New System.Drawing.Point(14, 28) Me.ucRules.Name = "ucRules" - Me.ucRules.Size = New System.Drawing.Size(568, 344) + Me.ucRules.Size = New System.Drawing.Size(700, 404) Me.ucRules.TabIndex = 0 ' 'epErrors @@ -132,7 +132,7 @@ Partial Class VTimeZoneDlg ' Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnCancel - Me.ClientSize = New System.Drawing.Size(602, 537) + Me.ClientSize = New System.Drawing.Size(752, 619) Me.Controls.Add(Me.grpObRules) Me.Controls.Add(Me.txtLastModified) Me.Controls.Add(Me.txtTimeZoneUrl) diff --git a/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.vb b/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.vb index 9b49f46..6f23f72 100644 --- a/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.vb +++ b/Source/VBNetDemos/CalendarBrowser/VTimeZoneDlg.vb @@ -19,11 +19,6 @@ ' 05/21/2007 EFW Converted for use with .NET 2.0 '================================================================================================================ -Imports System -Imports System.ComponentModel -Imports System.Drawing -Imports System.Windows.Forms - Imports EWSoftware.PDI.Objects ''' diff --git a/Source/VBNetDemos/PDIWebDemoVB/App_Code/AssemblyInfo.vb b/Source/VBNetDemos/PDIWebDemoVB/App_Code/AssemblyInfo.vb index b38c332..f11a248 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/App_Code/AssemblyInfo.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/App_Code/AssemblyInfo.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : AssemblyInfo.cs ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 01/19/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +' Updated : 11/22/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Visual Basic .NET ' ' PDI Web Demo assembly attributes @@ -18,7 +18,6 @@ ' 01/16/2005 EFW Created the code '=============================================================================================================== -Imports System Imports System.Reflection Imports System.Resources Imports System.Runtime.InteropServices @@ -28,7 +27,7 @@ Imports System.Runtime.InteropServices - + #If DEBUG @@ -52,5 +51,5 @@ Imports System.Runtime.InteropServices ' Day of release ' Revision (typically zero unless multiple releases are made on the same day) ' - - + + diff --git a/Source/VBNetDemos/PDIWebDemoVB/App_Code/Global.asax.vb b/Source/VBNetDemos/PDIWebDemoVB/App_Code/Global.asax.vb index e79bd5e..190dc2f 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/App_Code/Global.asax.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/App_Code/Global.asax.vb @@ -19,9 +19,6 @@ ' 01/25/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.Collections - Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Parser diff --git a/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx b/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx index 10bddfc..285be25 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx +++ b/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx @@ -26,7 +26,7 @@ maximum of 1MB in this demo.

Select a file to upload -      diff --git a/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx.vb index 0a4312d..2781545 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/CalendarBrowser.aspx.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : CalendarBrowser.aspx.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 12/31/2014 -' Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +' Updated : 11/22/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This page is used to demonstrate the vCalendar/iCalendar classes @@ -18,13 +18,7 @@ ' 01/27/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel Imports System.IO -Imports System.Text -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Parser @@ -83,7 +77,7 @@ Partial Class CalendarBrowser End Sub ' HTML encode values displayed in the grid. - Protected Function EncodeValue(oValue As Object) As String + Protected Shared Function EncodeValue(oValue As Object) As String If Not (oValue Is Nothing) Then Return HttpUtility.HtmlEncode(oValue.ToString()) End If @@ -367,7 +361,7 @@ Partial Class CalendarBrowser ''' Due to the variety of properties in a calendar object, sorting is left up to the developer ''' utilizing a comparison delegate. This example sorts the collection by the start date/time property and, ''' if they are equal, the summary description. This is used to handle all of the collection types. - Private Function CalendarSorter(x As CalendarObject, y As CalendarObject) As Integer + Private Shared Function CalendarSorter(x As CalendarObject, y As CalendarObject) As Integer Dim d1, d2 As DateTime Dim summary1, summary2 As String diff --git a/Source/VBNetDemos/PDIWebDemoVB/CalendarObjectDetails.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/CalendarObjectDetails.aspx.vb index 007ceb5..8e06ba6 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/CalendarObjectDetails.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/CalendarObjectDetails.aspx.vb @@ -4,7 +4,7 @@ ' Author : Eric Woodruff (Eric@EWoodruff.us) ' Updated : 01/01/2015 ' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved -' Compiler: Microsoft Visual C# +' Compiler: Microsoft VB.NET ' ' This page is used to demonstrate the calendar classes. Currently, it allows editing of some basic information. ' Information in the data grids could also be edited. Time constraints limit what I have implemented so far but @@ -20,13 +20,7 @@ ' 01/29/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel Imports System.Globalization -Imports System.IO -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects diff --git a/Source/VBNetDemos/PDIWebDemoVB/EventRecurTestForm.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/EventRecurTestForm.aspx.vb index e9726fc..a42b9db 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/EventRecurTestForm.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/EventRecurTestForm.aspx.vb @@ -2,7 +2,7 @@ ' System : EWSoftware PDI Demonstration Applications ' File : EventRecurTestForm.aspx.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 11/21/2018 +' Updated : 11/22/2018 ' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' @@ -18,17 +18,11 @@ ' 01/25/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel -Imports System.Data Imports System.Globalization -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI -Imports EWSoftware.PDI.Parser Imports EWSoftware.PDI.Objects +Imports EWSoftware.PDI.Parser Imports EWSoftware.PDI.Properties Namespace PDIWebDemoVB @@ -78,7 +72,7 @@ Namespace PDIWebDemoVB End Sub ' Use some limitations to prevent overloading the server or timing out the page if possible - Private Sub ApplyLimits(ro As RecurringObject, r As Recurrence) + Private Shared Sub ApplyLimits(ro As RecurringObject, r As Recurrence) If r.Frequency > RecurFrequency.Hourly Then r.MaximumOccurrences = 5000 End If diff --git a/Source/VBNetDemos/PDIWebDemoVB/FreeBusyDetails.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/FreeBusyDetails.aspx.vb index 1a898c9..6b31655 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/FreeBusyDetails.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/FreeBusyDetails.aspx.vb @@ -4,7 +4,7 @@ ' Author : Eric Woodruff (Eric@EWoodruff.us) ' Updated : 12/31/2014 ' Note : Copyright 2004-2014, Eric Woodruff, All rights reserved -' Compiler: Microsoft Visual C# +' Compiler: Microsoft VB.NET ' ' This page is used to demonstrate the VFreeBusy class. Currently, it allows editing of some basic information. ' Information in the data grids could also be edited. Time constraints limit what I have implemented so far but @@ -20,13 +20,7 @@ ' 01/27/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel Imports System.Globalization -Imports System.IO -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects diff --git a/Source/VBNetDemos/PDIWebDemoVB/HolidayTestForm.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/HolidayTestForm.aspx.vb index 771279b..8dc44a2 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/HolidayTestForm.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/HolidayTestForm.aspx.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : HolidayTestForm.aspx.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 12/20/2014 -' Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +' Updated : 11/22/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This page is used to demonstrate the Holiday and date utility classes @@ -18,14 +18,7 @@ ' 01/25/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel -Imports System.Data Imports System.Globalization -Imports System.Linq -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports System.Xml.Serialization Imports EWSoftware.PDI @@ -205,15 +198,15 @@ Namespace PDIWebDemoVB ' Create holiday object and replace it in the collection If rbFloating.Checked = True Then - Dim fl As New FloatingHoliday() - - fl.Month = cboMonth.SelectedIndex + 1 - fl.Description = DirectCast(e.Item.FindControl("txtDescription"), TextBox).Text - fl.Occurrence = CType(DirectCast(e.Item.FindControl("cboOccurrence"), - DropDownList).SelectedIndex + 1, DayOccurrence) - fl.Weekday = CType(DirectCast(e.Item.FindControl("cboDayOfWeek"), DropDownList).SelectedIndex, - System.DayOfWeek) - fl.Offset = Convert.ToInt32(DirectCast(e.Item.FindControl("txtOffset"), TextBox).Text) + Dim fl As New FloatingHoliday With { + .Month = cboMonth.SelectedIndex + 1, + .Description = DirectCast(e.Item.FindControl("txtDescription"), TextBox).Text, + .Occurrence = CType(DirectCast(e.Item.FindControl("cboOccurrence"), + DropDownList).SelectedIndex + 1, DayOccurrence), + .Weekday = CType(DirectCast(e.Item.FindControl("cboDayOfWeek"), DropDownList).SelectedIndex, + DayOfWeek), + .Offset = Convert.ToInt32(DirectCast(e.Item.FindControl("txtOffset"), TextBox).Text) + } hc(e.Item.ItemIndex) = fl Else @@ -226,12 +219,12 @@ Namespace PDIWebDemoVB Return End If - Dim fx As FixedHoliday = New FixedHoliday() - - fx.Month = cboMonth.SelectedIndex + 1 - fx.Description = DirectCast(e.Item.FindControl("txtDescription"), TextBox).Text - fx.AdjustFixedDate = DirectCast(e.Item.FindControl("chkAdjustDate"), CheckBox).Checked - fx.Day = Convert.ToInt32(DirectCast(e.Item.FindControl("txtDayOfMonth"), TextBox).Text) + Dim fx As FixedHoliday = New FixedHoliday With { + .Month = cboMonth.SelectedIndex + 1, + .Description = DirectCast(e.Item.FindControl("txtDescription"), TextBox).Text, + .AdjustFixedDate = DirectCast(e.Item.FindControl("chkAdjustDate"), CheckBox).Checked, + .Day = Convert.ToInt32(DirectCast(e.Item.FindControl("txtDayOfMonth"), TextBox).Text) + } hc(e.Item.ItemIndex) = fx End If diff --git a/Source/VBNetDemos/PDIWebDemoVB/MasterPage.master.vb b/Source/VBNetDemos/PDIWebDemoVB/MasterPage.master.vb index 3fee20d..130f86e 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/MasterPage.master.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/MasterPage.master.vb @@ -4,7 +4,7 @@ ' Author : Eric Woodruff (Eric@EWoodruff.us) ' Updated : 12/29/2014 ' Note : Copyright 2004-2014, Eric Woodruff, All rights reserved -' Compiler: Microsoft Visual C# +' Compiler: Microsoft VB.NET ' ' PDI Web Demo master page ' @@ -18,10 +18,6 @@ ' 01/16/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.Data -Imports System.Configuration - Namespace PDIWebDemoVB Public Partial Class MasterPage diff --git a/Source/VBNetDemos/PDIWebDemoVB/PDIWebDemoVB.vsspell b/Source/VBNetDemos/PDIWebDemoVB/PDIWebDemoVB.vsspell new file mode 100644 index 0000000..bf95e47 --- /dev/null +++ b/Source/VBNetDemos/PDIWebDemoVB/PDIWebDemoVB.vsspell @@ -0,0 +1,17 @@ + + + + True + + True + + True + True + True + True + + navbar + Dest + + \ No newline at end of file diff --git a/Source/VBNetDemos/PDIWebDemoVB/RFC2426.vcf b/Source/VBNetDemos/PDIWebDemoVB/RFC2426.vcf index 942adda..25d6572 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/RFC2426.vcf +++ b/Source/VBNetDemos/PDIWebDemoVB/RFC2426.vcf @@ -318,7 +318,9 @@ NOTE:Just a little test note URL:http://www.ewoodruff.us TZ;VALUE=TEXT:(GMT-08:00) Pacific Time (US & Canada)\; Tijuana GEO:47.551324;-117.644544 -REV:2005-01-24T22:47:38Z +REV:2018-11-22T22:39:31Z UID:687DF7A7-8168-4BD8-928C-5665B6AEED74 -LOGO;VALUE=URI;TYPE=PNG:https://github.com/EWSoftware/PDI/blob/master/NuGet/EWSPDI.png +PHOTO;VALUE=URI;TYPE=JPEG:http://www.EWoodruff.us/Images/Avatar.jpg +LOGO;VALUE=URI;TYPE=PNG:https://raw.githubusercontent.com/EWSoftware/PDI/ma + ster/EWSPDI.png END:VCARD diff --git a/Source/VBNetDemos/PDIWebDemoVB/RRuleTestForm.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/RRuleTestForm.aspx.vb index 2b0f501..4fe690a 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/RRuleTestForm.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/RRuleTestForm.aspx.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : RRuleTestForm.aspx.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 12/31/2014 -' Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +' Updated : 11/22/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This page is used to demonstrate the recurrence engine @@ -20,13 +20,7 @@ ' 02/10/2007 EFW Update for .NET 2.0 and new RecurrencePattern control '================================================================================================================ -Imports System -Imports System.ComponentModel -Imports System.Data Imports System.Globalization -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI @@ -83,10 +77,9 @@ Namespace PDIWebDemoVB End If ' Define the recurrence rule by parsing the text - Dim r As New Recurrence(txtRRULE.Text) - r.StartDateTime = dt + Dim r As New Recurrence(txtRRULE.Text) With { .StartDateTime = dt } - ' Synch the pattern control to the RRULE if not called by the pattern's test button + ' Synch the pattern control to the RRULE if not called by the pattern's test button If Not sender.Equals(btnTestPattern) Then rpRecurrence.SetRecurrence(r) End If diff --git a/Source/VBNetDemos/PDIWebDemoVB/ShowImage.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/ShowImage.aspx.vb index 29813ce..7701d04 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/ShowImage.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/ShowImage.aspx.vb @@ -18,16 +18,8 @@ ' 01/25/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel -Imports System.Globalization -Imports System.IO -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI.Objects -Imports EWSoftware.PDI.Properties Namespace PDIWebDemoVB diff --git a/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx b/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx index f1dcc95..00a330b 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx +++ b/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx @@ -26,7 +26,7 @@ demo.

Select a file to upload -      diff --git a/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx.vb index bc2267c..b4f4e3f 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/VCardBrowser.aspx.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : VCardBrowser.aspx.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 12/13/2014 -' Note : Copyright 2004-2014, Eric Woodruff, All rights reserved +' Updated : 11/22/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Microsoft VB.NET ' ' This page is used to demonstrate the vCard classes @@ -18,13 +18,7 @@ ' 01/25/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel Imports System.IO -Imports System.Text -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI.Objects Imports EWSoftware.PDI.Parser @@ -61,7 +55,7 @@ Partial Class VCardBrowser End Sub ' HTML encode values displayed in the grid. - Protected Function EncodeValue(oValue As Object) As String + Protected Shared Function EncodeValue(oValue As Object) As String If Not (oValue Is Nothing) Then Return HttpUtility.HtmlEncode(oValue.ToString()) End If @@ -200,7 +194,7 @@ Partial Class VCardBrowser ''' Due to the variety of properties in a vCard, sorting is left up to the developer utilizing a ''' comparison delegate. This example sorts the collection by the name property taking into account the ''' SortStringProperty if set. - Private Function VCardSorter(x As VCard, y As VCard) As Integer + Private Shared Function VCardSorter(x As VCard, y As VCard) As Integer Dim sortName1, sortName2 As String ' Get the names to compare. Precedence is given to the SortStringProperty as that is the purpose of its diff --git a/Source/VBNetDemos/PDIWebDemoVB/VCardDetails.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/VCardDetails.aspx.vb index 0209a31..cf2a9c6 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/VCardDetails.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/VCardDetails.aspx.vb @@ -20,13 +20,7 @@ ' 01/27/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel Imports System.Globalization -Imports System.IO -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects diff --git a/Source/VBNetDemos/PDIWebDemoVB/VTimeZoneTestForm.aspx.vb b/Source/VBNetDemos/PDIWebDemoVB/VTimeZoneTestForm.aspx.vb index b2627bd..b8c35b5 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/VTimeZoneTestForm.aspx.vb +++ b/Source/VBNetDemos/PDIWebDemoVB/VTimeZoneTestForm.aspx.vb @@ -18,13 +18,7 @@ ' 01/25/2005 EFW Created the code '================================================================================================================ -Imports System -Imports System.ComponentModel -Imports System.Data Imports System.Globalization -Imports System.Web -Imports System.Web.UI -Imports System.Web.UI.WebControls Imports EWSoftware.PDI Imports EWSoftware.PDI.Objects diff --git a/Source/VBNetDemos/PDIWebDemoVB/Web.config b/Source/VBNetDemos/PDIWebDemoVB/Web.config index 02b3d30..0964942 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/Web.config +++ b/Source/VBNetDemos/PDIWebDemoVB/Web.config @@ -29,7 +29,7 @@ - + diff --git a/Source/VBNetDemos/PDIWebDemoVB/vwd.webinfo b/Source/VBNetDemos/PDIWebDemoVB/vwd.webinfo index 9b35a38..480ffe6 100644 --- a/Source/VBNetDemos/PDIWebDemoVB/vwd.webinfo +++ b/Source/VBNetDemos/PDIWebDemoVB/vwd.webinfo @@ -167,6 +167,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.Designer.vb b/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.Designer.vb index 0ec66db..0e15682 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.Designer.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.Designer.vb @@ -41,9 +41,9 @@ Partial Class AboutDlg ' 'lnkHelp ' - Me.lnkHelp.Location = New System.Drawing.Point(168, 301) + Me.lnkHelp.Location = New System.Drawing.Point(187, 334) Me.lnkHelp.Name = "lnkHelp" - Me.lnkHelp.Size = New System.Drawing.Size(144, 18) + Me.lnkHelp.Size = New System.Drawing.Size(216, 23) Me.lnkHelp.TabIndex = 6 Me.lnkHelp.TabStop = true Me.lnkHelp.Text = "Eric@EWoodruff.us" @@ -51,22 +51,22 @@ Partial Class AboutDlg 'ColumnHeader1 ' Me.ColumnHeader1.Text = "Name" - Me.ColumnHeader1.Width = 250 + Me.ColumnHeader1.Width = 275 ' 'btnSysInfo ' - Me.btnSysInfo.Location = New System.Drawing.Point(334, 349) + Me.btnSysInfo.Location = New System.Drawing.Point(355, 398) Me.btnSysInfo.Name = "btnSysInfo" - Me.btnSysInfo.Size = New System.Drawing.Size(112, 32) + Me.btnSysInfo.Size = New System.Drawing.Size(150, 32) Me.btnSysInfo.TabIndex = 9 Me.btnSysInfo.Text = "System Info..." ' 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(216, 349) + Me.btnOK.Location = New System.Drawing.Point(199, 398) Me.btnOK.Name = "btnOK" - Me.btnOK.Size = New System.Drawing.Size(112, 32) + Me.btnOK.Size = New System.Drawing.Size(150, 32) Me.btnOK.TabIndex = 8 Me.btnOK.Text = "OK" ' @@ -76,10 +76,10 @@ Partial Class AboutDlg Me.lvComponents.FullRowSelect = true Me.lvComponents.GridLines = true Me.lvComponents.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable - Me.lvComponents.Location = New System.Drawing.Point(12, 128) + Me.lvComponents.Location = New System.Drawing.Point(12, 153) Me.lvComponents.MultiSelect = false Me.lvComponents.Name = "lvComponents" - Me.lvComponents.Size = New System.Drawing.Size(434, 170) + Me.lvComponents.Size = New System.Drawing.Size(493, 170) Me.lvComponents.TabIndex = 4 Me.lvComponents.UseCompatibleStateImageBehavior = false Me.lvComponents.View = System.Windows.Forms.View.Details @@ -91,9 +91,9 @@ Partial Class AboutDlg ' 'Label1 ' - Me.Label1.Location = New System.Drawing.Point(12, 106) + Me.Label1.Location = New System.Drawing.Point(8, 127) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(164, 19) + Me.Label1.Size = New System.Drawing.Size(164, 23) Me.Label1.TabIndex = 3 Me.Label1.Text = "Product Components" ' @@ -101,23 +101,23 @@ Partial Class AboutDlg ' Me.lblName.Location = New System.Drawing.Point(80, 8) Me.lblName.Name = "lblName" - Me.lblName.Size = New System.Drawing.Size(366, 19) + Me.lblName.Size = New System.Drawing.Size(425, 23) Me.lblName.TabIndex = 0 Me.lblName.Text = "" ' 'lblDescription ' - Me.lblDescription.Location = New System.Drawing.Point(80, 56) + Me.lblDescription.Location = New System.Drawing.Point(80, 64) Me.lblDescription.Name = "lblDescription" - Me.lblDescription.Size = New System.Drawing.Size(366, 40) + Me.lblDescription.Size = New System.Drawing.Size(425, 67) Me.lblDescription.TabIndex = 2 Me.lblDescription.Text = "" ' 'lblCopyright ' - Me.lblCopyright.Location = New System.Drawing.Point(12, 327) + Me.lblCopyright.Location = New System.Drawing.Point(12, 364) Me.lblCopyright.Name = "lblCopyright" - Me.lblCopyright.Size = New System.Drawing.Size(434, 19) + Me.lblCopyright.Size = New System.Drawing.Size(493, 23) Me.lblCopyright.TabIndex = 7 Me.lblCopyright.Text = "" ' @@ -133,17 +133,17 @@ Partial Class AboutDlg ' 'lblVersion ' - Me.lblVersion.Location = New System.Drawing.Point(80, 32) + Me.lblVersion.Location = New System.Drawing.Point(80, 36) Me.lblVersion.Name = "lblVersion" - Me.lblVersion.Size = New System.Drawing.Size(366, 19) + Me.lblVersion.Size = New System.Drawing.Size(425, 23) Me.lblVersion.TabIndex = 1 Me.lblVersion.Text = "" ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(10, 301) + Me.label2.Location = New System.Drawing.Point(12, 334) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(162, 19) + Me.label2.Size = New System.Drawing.Size(178, 23) Me.label2.TabIndex = 5 Me.label2.Text = "For help send e-mail to" ' @@ -151,7 +151,7 @@ Partial Class AboutDlg ' Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnOK - Me.ClientSize = New System.Drawing.Size(458, 393) + Me.ClientSize = New System.Drawing.Size(517, 442) Me.Controls.Add(Me.lnkHelp) Me.Controls.Add(Me.label2) Me.Controls.Add(Me.btnSysInfo) diff --git a/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.vb b/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.vb index 2d76e0d..1760a0e 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/AboutDlg.vb @@ -1,9 +1,9 @@ '================================================================================================================ ' File : AboutDlg.vb ' Author : Eric Woodruff -' Updated : 01/02/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved -' Compiler: Microsoft Visual C# +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved +' Compiler: Microsoft VB.NET ' ' This form is used to display application version information ' @@ -17,6 +17,8 @@ ' 11/10/2003 EFW Created the code '================================================================================================================ +' Ignore Spelling: mailto + Imports System.Reflection Public Partial Class AboutDlg @@ -28,8 +30,7 @@ Public Partial Class AboutDlg InitializeComponent() End Sub - Private Sub AboutDlg_Load(ByVal sender As Object, _ - ByVal e As System.EventArgs) Handles MyBase.Load + Private Sub AboutDlg_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles MyBase.Load ' Get assembly information not available from the application object Dim asm As [Assembly] = [Assembly].GetEntryAssembly() Dim title As AssemblyTitleAttribute = DirectCast(AssemblyTitleAttribute.GetCustomAttribute(asm, @@ -58,8 +59,7 @@ Public Partial Class AboutDlg lnkHelp.Links(0).LinkData = "mailto:" & lnkHelp.Text & "?Subject=EWSoftware PDIWinFormsTest Demo" End Sub - Private Sub btnSysInfo_Click(ByVal sender As System.Object, _ - ByVal e As System.EventArgs) Handles btnSysInfo.Click + Private Sub btnSysInfo_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnSysInfo.Click Try System.Diagnostics.Process.Start("MSInfo32.exe") Catch ex As Exception @@ -71,9 +71,8 @@ Public Partial Class AboutDlg End Try End Sub - Private Sub lnkHelp_LinkClicked(ByVal sender As System.Object, _ - ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) _ - Handles lnkHelp.LinkClicked + Private Sub lnkHelp_LinkClicked(ByVal sender As System.Object, + ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles lnkHelp.LinkClicked Try ' Launch the e-mail URL, this will fail if user does not have an association for e-mail URLs System.Diagnostics.Process.Start(DirectCast(e.Link.LinkData, String)) @@ -81,7 +80,7 @@ Public Partial Class AboutDlg MessageBox.Show("Unable to launch e-mail editor", "E-Mail Error", MessageBoxButtons.OK, MessageBoxIcon.Error) - ' Log the exception to the debugger for the developer. + ' Log the exception to the debugger for the developer System.Diagnostics.Debug.Write(ex.ToString()) End Try End Sub diff --git a/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.Designer.vb b/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.Designer.vb index 6ff70b6..fa3877c 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.Designer.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.Designer.vb @@ -40,9 +40,9 @@ Partial Class EventRecurTestForm ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(12, 88) + Me.label3.Location = New System.Drawing.Point(14, 118) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(372, 24) + Me.label3.Size = New System.Drawing.Size(417, 23) Me.label3.TabIndex = 7 Me.label3.Text = "&Enter a VEVENT, VTODO, or VJOURNAL entry below." Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -53,11 +53,11 @@ Partial Class EventRecurTestForm Me.txtCalendar.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.txtCalendar.Location = New System.Drawing.Point(12, 115) + Me.txtCalendar.Location = New System.Drawing.Point(18, 145) Me.txtCalendar.Multiline = true Me.txtCalendar.Name = "txtCalendar" Me.txtCalendar.ScrollBars = System.Windows.Forms.ScrollBars.Both - Me.txtCalendar.Size = New System.Drawing.Size(371, 414) + Me.txtCalendar.Size = New System.Drawing.Size(413, 379) Me.txtCalendar.TabIndex = 8 Me.txtCalendar.WordWrap = false ' @@ -65,7 +65,7 @@ Partial Class EventRecurTestForm ' Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnClose.Location = New System.Drawing.Point(757, 491) + Me.btnClose.Location = New System.Drawing.Point(878, 530) Me.btnClose.Name = "btnClose" Me.btnClose.Size = New System.Drawing.Size(88, 32) Me.btnClose.TabIndex = 12 @@ -75,16 +75,16 @@ Partial Class EventRecurTestForm ' Me.lbDates.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.lbDates.ItemHeight = 16 - Me.lbDates.Location = New System.Drawing.Point(389, 128) + Me.lbDates.ItemHeight = 20 + Me.lbDates.Location = New System.Drawing.Point(437, 177) Me.lbDates.Name = "lbDates" - Me.lbDates.Size = New System.Drawing.Size(456, 356) + Me.lbDates.Size = New System.Drawing.Size(529, 344) Me.lbDates.TabIndex = 10 ' 'btnTest ' Me.btnTest.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.btnTest.Location = New System.Drawing.Point(663, 491) + Me.btnTest.Location = New System.Drawing.Point(784, 530) Me.btnTest.Name = "btnTest" Me.btnTest.Size = New System.Drawing.Size(88, 32) Me.btnTest.TabIndex = 11 @@ -92,19 +92,19 @@ Partial Class EventRecurTestForm ' 'dtpStartDate ' + Me.dtpStartDate.Checked = false Me.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpStartDate.Location = New System.Drawing.Point(184, 8) + Me.dtpStartDate.Location = New System.Drawing.Point(329, 12) Me.dtpStartDate.Name = "dtpStartDate" - Me.dtpStartDate.Size = New System.Drawing.Size(190, 22) + Me.dtpStartDate.Size = New System.Drawing.Size(235, 26) Me.dtpStartDate.TabIndex = 1 - Me.dtpStartDate.Value = New Date(2004, 9, 6, 0, 0, 0, 0) ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(14, 8) + Me.label1.Location = New System.Drawing.Point(124, 12) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(164, 23) + Me.label1.Size = New System.Drawing.Size(199, 23) Me.label1.TabIndex = 0 Me.label1.Text = "&Find instances between" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -113,27 +113,27 @@ Partial Class EventRecurTestForm ' Me.lblCount.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.lblCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - Me.lblCount.Location = New System.Drawing.Point(389, 67) + Me.lblCount.Location = New System.Drawing.Point(437, 118) Me.lblCount.Name = "lblCount" - Me.lblCount.Size = New System.Drawing.Size(454, 56) + Me.lblCount.Size = New System.Drawing.Size(529, 56) Me.lblCount.TabIndex = 9 Me.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' 'dtpEndDate ' + Me.dtpEndDate.Checked = false Me.dtpEndDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpEndDate.Location = New System.Drawing.Point(418, 8) + Me.dtpEndDate.Location = New System.Drawing.Point(627, 12) Me.dtpEndDate.Name = "dtpEndDate" - Me.dtpEndDate.Size = New System.Drawing.Size(190, 22) + Me.dtpEndDate.Size = New System.Drawing.Size(235, 26) Me.dtpEndDate.TabIndex = 3 - Me.dtpEndDate.Value = New Date(2004, 9, 6, 0, 0, 0, 0) ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(380, 8) + Me.label2.Location = New System.Drawing.Point(570, 12) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(32, 23) + Me.label2.Size = New System.Drawing.Size(51, 23) Me.label2.TabIndex = 2 Me.label2.Text = "and" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -142,17 +142,17 @@ Partial Class EventRecurTestForm ' Me.chkInLocalTime.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.chkInLocalTime.Location = New System.Drawing.Point(622, 8) + Me.chkInLocalTime.Location = New System.Drawing.Point(329, 44) Me.chkInLocalTime.Name = "chkInLocalTime" - Me.chkInLocalTime.Size = New System.Drawing.Size(210, 24) + Me.chkInLocalTime.Size = New System.Drawing.Size(310, 24) Me.chkInLocalTime.TabIndex = 4 Me.chkInLocalTime.Text = "Find instances in local time" ' 'label6 ' - Me.label6.Location = New System.Drawing.Point(12, 40) + Me.label6.Location = New System.Drawing.Point(10, 76) Me.label6.Name = "label6" - Me.label6.Size = New System.Drawing.Size(262, 23) + Me.label6.Size = New System.Drawing.Size(313, 23) Me.label6.TabIndex = 5 Me.label6.Text = "&Apply this time zone to the component" Me.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -162,17 +162,17 @@ Partial Class EventRecurTestForm Me.cboTimeZone.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.cboTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboTimeZone.Location = New System.Drawing.Point(280, 40) + Me.cboTimeZone.Location = New System.Drawing.Point(329, 74) Me.cboTimeZone.MaxDropDownItems = 16 Me.cboTimeZone.Name = "cboTimeZone" - Me.cboTimeZone.Size = New System.Drawing.Size(447, 24) + Me.cboTimeZone.Size = New System.Drawing.Size(568, 28) Me.cboTimeZone.TabIndex = 6 ' 'EventRecurTestForm ' Me.AcceptButton = Me.btnTest Me.CancelButton = Me.btnClose - Me.ClientSize = New System.Drawing.Size(857, 535) + Me.ClientSize = New System.Drawing.Size(978, 574) Me.Controls.Add(Me.chkInLocalTime) Me.Controls.Add(Me.label6) Me.Controls.Add(Me.cboTimeZone) @@ -188,7 +188,7 @@ Partial Class EventRecurTestForm Me.Controls.Add(Me.label3) Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) Me.MinimizeBox = false - Me.MinimumSize = New System.Drawing.Size(865, 575) + Me.MinimumSize = New System.Drawing.Size(1000, 575) Me.Name = "EventRecurTestForm" Me.ShowInTaskbar = false Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show diff --git a/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.vb b/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.vb index 602e998..d344834 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/EventRecurTestForm.vb @@ -18,7 +18,6 @@ ' 12/01/2004 EFW Created the code '================================================================================================================ -Imports System.ComponentModel Imports System.Globalization Imports EWSoftware.PDI diff --git a/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.Designer.vb b/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.Designer.vb index 055bdff..e886f0e 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.Designer.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.Designer.vb @@ -55,7 +55,7 @@ Partial Class HolidayTestForm 'btnClose ' Me.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnClose.Location = New System.Drawing.Point(724, 381) + Me.btnClose.Location = New System.Drawing.Point(851, 391) Me.btnClose.Name = "btnClose" Me.btnClose.Size = New System.Drawing.Size(88, 32) Me.btnClose.TabIndex = 2 @@ -66,7 +66,7 @@ Partial Class HolidayTestForm Me.groupBox1.Controls.Add(Me.hmHolidays) Me.groupBox1.Location = New System.Drawing.Point(12, 12) Me.groupBox1.Name = "groupBox1" - Me.groupBox1.Size = New System.Drawing.Size(286, 401) + Me.groupBox1.Size = New System.Drawing.Size(348, 401) Me.groupBox1.TabIndex = 0 Me.groupBox1.TabStop = false Me.groupBox1.Text = "H&olidays" @@ -75,7 +75,7 @@ Partial Class HolidayTestForm ' Me.hmHolidays.Location = New System.Drawing.Point(8, 24) Me.hmHolidays.Name = "hmHolidays" - Me.hmHolidays.Size = New System.Drawing.Size(272, 368) + Me.hmHolidays.Size = New System.Drawing.Size(334, 368) Me.hmHolidays.TabIndex = 0 ' 'groupBox2 @@ -91,9 +91,9 @@ Partial Class HolidayTestForm Me.groupBox2.Controls.Add(Me.label1) Me.groupBox2.Controls.Add(Me.btnTestDate) Me.groupBox2.Controls.Add(Me.label3) - Me.groupBox2.Location = New System.Drawing.Point(304, 12) + Me.groupBox2.Location = New System.Drawing.Point(366, 12) Me.groupBox2.Name = "groupBox2" - Me.groupBox2.Size = New System.Drawing.Size(508, 363) + Me.groupBox2.Size = New System.Drawing.Size(573, 373) Me.groupBox2.TabIndex = 1 Me.groupBox2.TabStop = false Me.groupBox2.Text = "Test Date Detection" @@ -128,7 +128,7 @@ Partial Class HolidayTestForm Me.dgvDatesFound.RowHeadersVisible = false Me.dgvDatesFound.RowTemplate.Height = 24 Me.dgvDatesFound.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvDatesFound.Size = New System.Drawing.Size(337, 298) + Me.dgvDatesFound.Size = New System.Drawing.Size(372, 298) Me.dgvDatesFound.TabIndex = 10 ' 'tbcDate @@ -145,46 +145,46 @@ Partial Class HolidayTestForm Me.tbcDescription.HeaderText = "Description" Me.tbcDescription.Name = "tbcDescription" Me.tbcDescription.ReadOnly = true - Me.tbcDescription.Width = 210 + Me.tbcDescription.Width = 230 ' 'dtpTestDate ' Me.dtpTestDate.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.dtpTestDate.Location = New System.Drawing.Point(96, 331) + Me.dtpTestDate.Location = New System.Drawing.Point(100, 335) Me.dtpTestDate.Name = "dtpTestDate" - Me.dtpTestDate.Size = New System.Drawing.Size(110, 22) + Me.dtpTestDate.Size = New System.Drawing.Size(135, 26) Me.dtpTestDate.TabIndex = 8 ' 'udcToYear ' - Me.udcToYear.Location = New System.Drawing.Point(439, 64) + Me.udcToYear.Location = New System.Drawing.Point(490, 47) Me.udcToYear.Maximum = New Decimal(New Integer() {9999, 0, 0, 0}) Me.udcToYear.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) Me.udcToYear.Name = "udcToYear" - Me.udcToYear.Size = New System.Drawing.Size(56, 22) + Me.udcToYear.Size = New System.Drawing.Size(75, 26) Me.udcToYear.TabIndex = 3 Me.udcToYear.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - Me.udcToYear.Value = New Decimal(New Integer() {2004, 0, 0, 0}) + Me.udcToYear.Value = New Decimal(New Integer() {2023, 0, 0, 0}) ' 'udcFromYear ' - Me.udcFromYear.Location = New System.Drawing.Point(349, 64) + Me.udcFromYear.Location = New System.Drawing.Point(391, 47) Me.udcFromYear.Maximum = New Decimal(New Integer() {9999, 0, 0, 0}) Me.udcFromYear.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) Me.udcFromYear.Name = "udcFromYear" - Me.udcFromYear.Size = New System.Drawing.Size(56, 22) + Me.udcFromYear.Size = New System.Drawing.Size(75, 26) Me.udcFromYear.TabIndex = 1 Me.udcFromYear.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - Me.udcFromYear.Value = New Decimal(New Integer() {2000, 0, 0, 0}) + Me.udcFromYear.Value = New Decimal(New Integer() {2017, 0, 0, 0}) ' 'grpEaster ' Me.grpEaster.Controls.Add(Me.rbGregorian) Me.grpEaster.Controls.Add(Me.rbOrthodox) Me.grpEaster.Controls.Add(Me.rbJulian) - Me.grpEaster.Location = New System.Drawing.Point(349, 92) + Me.grpEaster.Location = New System.Drawing.Point(391, 87) Me.grpEaster.Name = "grpEaster" - Me.grpEaster.Size = New System.Drawing.Size(144, 120) + Me.grpEaster.Size = New System.Drawing.Size(165, 134) Me.grpEaster.TabIndex = 4 Me.grpEaster.TabStop = false Me.grpEaster.Text = "Easter Method" @@ -192,72 +192,72 @@ Partial Class HolidayTestForm 'rbGregorian ' Me.rbGregorian.Checked = true - Me.rbGregorian.Location = New System.Drawing.Point(24, 88) + Me.rbGregorian.Location = New System.Drawing.Point(25, 94) Me.rbGregorian.Name = "rbGregorian" - Me.rbGregorian.Size = New System.Drawing.Size(104, 24) + Me.rbGregorian.Size = New System.Drawing.Size(115, 24) Me.rbGregorian.TabIndex = 2 Me.rbGregorian.TabStop = true Me.rbGregorian.Text = "Gregorian" ' 'rbOrthodox ' - Me.rbOrthodox.Location = New System.Drawing.Point(24, 56) + Me.rbOrthodox.Location = New System.Drawing.Point(25, 64) Me.rbOrthodox.Name = "rbOrthodox" - Me.rbOrthodox.Size = New System.Drawing.Size(104, 24) + Me.rbOrthodox.Size = New System.Drawing.Size(115, 24) Me.rbOrthodox.TabIndex = 1 Me.rbOrthodox.Text = "Orthodox" ' 'rbJulian ' - Me.rbJulian.Location = New System.Drawing.Point(24, 24) + Me.rbJulian.Location = New System.Drawing.Point(25, 34) Me.rbJulian.Name = "rbJulian" - Me.rbJulian.Size = New System.Drawing.Size(104, 24) + Me.rbJulian.Size = New System.Drawing.Size(115, 24) Me.rbJulian.TabIndex = 0 Me.rbJulian.Text = "Julian" ' 'btnEaster ' - Me.btnEaster.Location = New System.Drawing.Point(352, 280) + Me.btnEaster.Location = New System.Drawing.Point(391, 287) Me.btnEaster.Name = "btnEaster" - Me.btnEaster.Size = New System.Drawing.Size(136, 32) + Me.btnEaster.Size = New System.Drawing.Size(140, 32) Me.btnEaster.TabIndex = 6 Me.btnEaster.Text = "Find Ea&ster" ' 'btnFind ' - Me.btnFind.Location = New System.Drawing.Point(352, 232) + Me.btnFind.Location = New System.Drawing.Point(391, 241) Me.btnFind.Name = "btnFind" - Me.btnFind.Size = New System.Drawing.Size(136, 32) + Me.btnFind.Size = New System.Drawing.Size(140, 32) Me.btnFind.TabIndex = 5 Me.btnFind.Text = "&Find Holidays" ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(439, 40) + Me.label2.Location = New System.Drawing.Point(490, 21) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(62, 23) + Me.label2.Size = New System.Drawing.Size(75, 23) Me.label2.TabIndex = 2 Me.label2.Text = "To Year" ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(349, 40) + Me.label1.Location = New System.Drawing.Point(391, 21) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(84, 23) + Me.label1.Size = New System.Drawing.Size(93, 23) Me.label1.TabIndex = 0 Me.label1.Text = "Fro&m Year" ' 'btnTestDate ' - Me.btnTestDate.Location = New System.Drawing.Point(212, 325) + Me.btnTestDate.Location = New System.Drawing.Point(241, 332) Me.btnTestDate.Name = "btnTestDate" - Me.btnTestDate.Size = New System.Drawing.Size(88, 32) + Me.btnTestDate.Size = New System.Drawing.Size(137, 32) Me.btnTestDate.TabIndex = 9 Me.btnTestDate.Text = "&Holiday?" ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(6, 330) + Me.label3.Location = New System.Drawing.Point(10, 337) Me.label3.Name = "label3" Me.label3.Size = New System.Drawing.Size(84, 23) Me.label3.TabIndex = 7 @@ -267,7 +267,7 @@ Partial Class HolidayTestForm 'HolidayTestForm ' Me.CancelButton = Me.btnClose - Me.ClientSize = New System.Drawing.Size(824, 425) + Me.ClientSize = New System.Drawing.Size(951, 435) Me.Controls.Add(Me.btnClose) Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.groupBox2) @@ -307,7 +307,6 @@ End Sub Friend WithEvents dtpTestDate As System.Windows.Forms.DateTimePicker Friend WithEvents hmHolidays As EWSoftware.PDI.Windows.Forms.HolidayManager Private WithEvents dgvDatesFound As System.Windows.Forms.DataGridView - Private WithEvents tbcDate As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcDescription As System.Windows.Forms.DataGridViewTextBoxColumn - + Friend WithEvents tbcDate As DataGridViewTextBoxColumn + Friend WithEvents tbcDescription As DataGridViewTextBoxColumn End Class diff --git a/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.vb b/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.vb index a9d9fab..6d5b7f7 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/HolidayTestForm.vb @@ -4,7 +4,7 @@ ' Author : Eric Woodruff (Eric@EWoodruff.us) ' Updated : 01/02/2015 ' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved -' Compiler: Visual C# +' Compiler: Microsoft VB.NET ' ' This is used to test the various Holiday classes and the DateUtils class ' diff --git a/Source/VBNetDemos/PDIWinFormsTest/MainForm.Designer.vb b/Source/VBNetDemos/PDIWinFormsTest/MainForm.Designer.vb index 70ac396..e1754b1 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/MainForm.Designer.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/MainForm.Designer.vb @@ -33,55 +33,55 @@ Partial Class MainForm ' 'btnHolidays ' - Me.btnHolidays.Location = New System.Drawing.Point(84, 18) + Me.btnHolidays.Location = New System.Drawing.Point(184, 18) Me.btnHolidays.Name = "btnHolidays" - Me.btnHolidays.Size = New System.Drawing.Size(138, 40) + Me.btnHolidays.Size = New System.Drawing.Size(160, 40) Me.btnHolidays.TabIndex = 0 Me.btnHolidays.Text = "Test &Holidays" ' 'btnExit ' - Me.btnExit.Location = New System.Drawing.Point(84, 293) + Me.btnExit.Location = New System.Drawing.Point(184, 293) Me.btnExit.Name = "btnExit" - Me.btnExit.Size = New System.Drawing.Size(138, 40) + Me.btnExit.Size = New System.Drawing.Size(160, 40) Me.btnExit.TabIndex = 5 Me.btnExit.Text = "E&xit" ' 'btnRRULE ' - Me.btnRRULE.Location = New System.Drawing.Point(84, 73) + Me.btnRRULE.Location = New System.Drawing.Point(184, 73) Me.btnRRULE.Name = "btnRRULE" - Me.btnRRULE.Size = New System.Drawing.Size(138, 40) + Me.btnRRULE.Size = New System.Drawing.Size(160, 40) Me.btnRRULE.TabIndex = 1 Me.btnRRULE.Text = "Test RR&ULE" ' 'btnTestCalRecur ' - Me.btnTestCalRecur.Location = New System.Drawing.Point(84, 128) + Me.btnTestCalRecur.Location = New System.Drawing.Point(184, 128) Me.btnTestCalRecur.Name = "btnTestCalRecur" - Me.btnTestCalRecur.Size = New System.Drawing.Size(138, 40) + Me.btnTestCalRecur.Size = New System.Drawing.Size(160, 40) Me.btnTestCalRecur.TabIndex = 2 Me.btnTestCalRecur.Text = "Test C&al Recur" ' 'btnTestVTimeZone ' - Me.btnTestVTimeZone.Location = New System.Drawing.Point(84, 183) + Me.btnTestVTimeZone.Location = New System.Drawing.Point(184, 183) Me.btnTestVTimeZone.Name = "btnTestVTimeZone" - Me.btnTestVTimeZone.Size = New System.Drawing.Size(138, 40) + Me.btnTestVTimeZone.Size = New System.Drawing.Size(160, 40) Me.btnTestVTimeZone.TabIndex = 3 Me.btnTestVTimeZone.Text = "Test &VTimeZone" ' 'btnAbout ' - Me.btnAbout.Location = New System.Drawing.Point(84, 238) + Me.btnAbout.Location = New System.Drawing.Point(184, 238) Me.btnAbout.Name = "btnAbout" - Me.btnAbout.Size = New System.Drawing.Size(138, 40) + Me.btnAbout.Size = New System.Drawing.Size(160, 40) Me.btnAbout.TabIndex = 4 Me.btnAbout.Text = "A&bout" ' 'MainForm ' - Me.ClientSize = New System.Drawing.Size(307, 353) + Me.ClientSize = New System.Drawing.Size(528, 353) Me.Controls.Add(Me.btnAbout) Me.Controls.Add(Me.btnTestVTimeZone) Me.Controls.Add(Me.btnTestCalRecur) diff --git a/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.Designer.vb b/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.Designer.vb index 90c92cc..103c469 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.Designer.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.Designer.vb @@ -40,9 +40,9 @@ Partial Class RRuleTestForm ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(14, 41) + Me.label3.Location = New System.Drawing.Point(14, 46) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(56, 23) + Me.label3.Size = New System.Drawing.Size(77, 23) Me.label3.TabIndex = 2 Me.label3.Text = "RR&ULE" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -51,11 +51,11 @@ Partial Class RRuleTestForm ' Me.txtRRULE.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.txtRRULE.Location = New System.Drawing.Point(76, 41) + Me.txtRRULE.Location = New System.Drawing.Point(97, 44) Me.txtRRULE.Multiline = true Me.txtRRULE.Name = "txtRRULE" Me.txtRRULE.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtRRULE.Size = New System.Drawing.Size(590, 64) + Me.txtRRULE.Size = New System.Drawing.Size(668, 64) Me.txtRRULE.TabIndex = 3 Me.txtRRULE.Text = "FREQ=DAILY;INTERVAL=5;COUNT=50" ' @@ -63,7 +63,7 @@ Partial Class RRuleTestForm ' Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnClose.Location = New System.Drawing.Point(674, 456) + Me.btnClose.Location = New System.Drawing.Point(778, 456) Me.btnClose.Name = "btnClose" Me.btnClose.Size = New System.Drawing.Size(88, 32) Me.btnClose.TabIndex = 10 @@ -73,16 +73,17 @@ Partial Class RRuleTestForm ' Me.lbDates.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) - Me.lbDates.ItemHeight = 16 - Me.lbDates.Location = New System.Drawing.Point(12, 169) + Me.lbDates.IntegralHeight = false + Me.lbDates.ItemHeight = 20 + Me.lbDates.Location = New System.Drawing.Point(12, 183) Me.lbDates.Name = "lbDates" - Me.lbDates.Size = New System.Drawing.Size(386, 276) + Me.lbDates.Size = New System.Drawing.Size(386, 250) Me.lbDates.TabIndex = 7 ' 'btnTest ' Me.btnTest.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.btnTest.Location = New System.Drawing.Point(580, 456) + Me.btnTest.Location = New System.Drawing.Point(684, 456) Me.btnTest.Name = "btnTest" Me.btnTest.Size = New System.Drawing.Size(88, 32) Me.btnTest.TabIndex = 9 @@ -90,19 +91,19 @@ Partial Class RRuleTestForm ' 'dtpStartDate ' + Me.dtpStartDate.Checked = false Me.dtpStartDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpStartDate.Location = New System.Drawing.Point(76, 12) + Me.dtpStartDate.Location = New System.Drawing.Point(97, 12) Me.dtpStartDate.Name = "dtpStartDate" - Me.dtpStartDate.Size = New System.Drawing.Size(190, 22) + Me.dtpStartDate.Size = New System.Drawing.Size(235, 26) Me.dtpStartDate.TabIndex = 1 - Me.dtpStartDate.Value = New Date(2004, 9, 6, 0, 0, 0, 0) ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(21, 12) + Me.label1.Location = New System.Drawing.Point(21, 14) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(49, 23) + Me.label1.Size = New System.Drawing.Size(70, 23) Me.label1.TabIndex = 0 Me.label1.Text = "&Start" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -112,9 +113,9 @@ Partial Class RRuleTestForm Me.lblCount.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.lblCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - Me.lblCount.Location = New System.Drawing.Point(12, 112) + Me.lblCount.Location = New System.Drawing.Point(12, 119) Me.lblCount.Name = "lblCount" - Me.lblCount.Size = New System.Drawing.Size(750, 48) + Me.lblCount.Size = New System.Drawing.Size(854, 48) Me.lblCount.TabIndex = 6 Me.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' @@ -126,15 +127,15 @@ Partial Class RRuleTestForm Me.hmHolidays.Location = New System.Drawing.Point(8, 24) Me.hmHolidays.Name = "hmHolidays" Me.hmHolidays.ShowLoadSaveControls = false - Me.hmHolidays.Size = New System.Drawing.Size(342, 256) + Me.hmHolidays.Size = New System.Drawing.Size(446, 243) Me.hmHolidays.TabIndex = 0 ' 'btnDesign ' Me.btnDesign.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.btnDesign.Location = New System.Drawing.Point(674, 38) + Me.btnDesign.Location = New System.Drawing.Point(771, 41) Me.btnDesign.Name = "btnDesign" - Me.btnDesign.Size = New System.Drawing.Size(88, 32) + Me.btnDesign.Size = New System.Drawing.Size(95, 32) Me.btnDesign.TabIndex = 4 Me.btnDesign.Text = "Desig&n" ' @@ -144,9 +145,9 @@ Partial Class RRuleTestForm Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.groupBox1.Controls.Add(Me.hmHolidays) - Me.groupBox1.Location = New System.Drawing.Point(404, 157) + Me.groupBox1.Location = New System.Drawing.Point(404, 170) Me.groupBox1.Name = "groupBox1" - Me.groupBox1.Size = New System.Drawing.Size(358, 288) + Me.groupBox1.Size = New System.Drawing.Size(462, 275) Me.groupBox1.TabIndex = 8 Me.groupBox1.TabStop = false Me.groupBox1.Text = "H&olidays" @@ -154,9 +155,9 @@ Partial Class RRuleTestForm 'btnDescribe ' Me.btnDescribe.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.btnDescribe.Location = New System.Drawing.Point(674, 76) + Me.btnDescribe.Location = New System.Drawing.Point(771, 79) Me.btnDescribe.Name = "btnDescribe" - Me.btnDescribe.Size = New System.Drawing.Size(88, 32) + Me.btnDescribe.Size = New System.Drawing.Size(95, 32) Me.btnDescribe.TabIndex = 5 Me.btnDescribe.Text = "Descri&be" ' @@ -164,7 +165,7 @@ Partial Class RRuleTestForm ' Me.AcceptButton = Me.btnTest Me.CancelButton = Me.btnClose - Me.ClientSize = New System.Drawing.Size(774, 500) + Me.ClientSize = New System.Drawing.Size(878, 500) Me.Controls.Add(Me.btnDescribe) Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.btnDesign) diff --git a/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.vb b/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.vb index 58fddd5..81d8d78 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/RRuleTestForm.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : RRuleTestForm.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 01/02/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Visual Basic .NET ' ' This is a simple demonstration used to test the recurrence engine which encapsulates the iCalendar 2.0 RRULE @@ -64,8 +64,7 @@ Public Partial Class RRuleTestForm lblCount.Text = String.Empty ' Define the recurrence rule by parsing the text - Dim r As New Recurrence(txtRRULE.Text) - r.StartDateTime = dtpStartDate.Value + Dim r As New Recurrence(txtRRULE.Text) With { .StartDateTime = dtpStartDate.Value } ' Get the currently defined set of holidays if necessary If r.CanOccurOnHoliday = False Then @@ -147,8 +146,7 @@ Public Partial Class RRuleTestForm ByVal e As System.EventArgs) Handles btnDesign.Click Using dlg As New RecurrencePropertiesDlg() Try - Dim r As New Recurrence(txtRRULE.Text) - r.StartDateTime = dtpStartDate.Value + Dim r As New Recurrence(txtRRULE.Text) With { .StartDateTime = dtpStartDate.Value } dlg.SetRecurrence(r) diff --git a/Source/VBNetDemos/PDIWinFormsTest/TimeZoneRegInfo.vb b/Source/VBNetDemos/PDIWinFormsTest/TimeZoneRegInfo.vb index a12ec08..46d1d26 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/TimeZoneRegInfo.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/TimeZoneRegInfo.vb @@ -19,6 +19,8 @@ ' 01/05/2005 EFW Factored out the code to share between applications '================================================================================================================ +' Ignore Spelling: Dlt + Imports System.Runtime.InteropServices Imports Microsoft.Win32 diff --git a/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.vb b/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.vb index ceb3ea2..398efe9 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.Designer.vb @@ -57,7 +57,7 @@ Partial Class VTimeZoneTestForm Me.groupBox1.Controls.Add(Me.label1) Me.groupBox1.Location = New System.Drawing.Point(12, 12) Me.groupBox1.Name = "groupBox1" - Me.groupBox1.Size = New System.Drawing.Size(735, 56) + Me.groupBox1.Size = New System.Drawing.Size(904, 66) Me.groupBox1.TabIndex = 0 Me.groupBox1.TabStop = false Me.groupBox1.Text = "Source Date" @@ -67,27 +67,27 @@ Partial Class VTimeZoneTestForm Me.cboSourceTimeZone.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.cboSourceTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboSourceTimeZone.Location = New System.Drawing.Point(292, 24) + Me.cboSourceTimeZone.Location = New System.Drawing.Point(366, 22) Me.cboSourceTimeZone.MaxDropDownItems = 16 Me.cboSourceTimeZone.Name = "cboSourceTimeZone" - Me.cboSourceTimeZone.Size = New System.Drawing.Size(430, 24) + Me.cboSourceTimeZone.Size = New System.Drawing.Size(503, 28) Me.cboSourceTimeZone.TabIndex = 2 ' 'dtpSourceDate ' + Me.dtpSourceDate.Checked = false Me.dtpSourceDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpSourceDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpSourceDate.Location = New System.Drawing.Point(96, 24) + Me.dtpSourceDate.Location = New System.Drawing.Point(125, 22) Me.dtpSourceDate.Name = "dtpSourceDate" - Me.dtpSourceDate.Size = New System.Drawing.Size(190, 22) + Me.dtpSourceDate.Size = New System.Drawing.Size(235, 26) Me.dtpSourceDate.TabIndex = 1 - Me.dtpSourceDate.Value = New Date(2004, 9, 6, 0, 0, 0, 0) ' 'label1 ' Me.label1.Location = New System.Drawing.Point(8, 24) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(80, 23) + Me.label1.Size = New System.Drawing.Size(111, 23) Me.label1.TabIndex = 0 Me.label1.Text = "&Date/Time" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -100,16 +100,17 @@ Partial Class VTimeZoneTestForm Me.groupBox2.Controls.Add(Me.label5) Me.groupBox2.Controls.Add(Me.lblLocalTime) Me.groupBox2.Controls.Add(Me.label2) - Me.groupBox2.Location = New System.Drawing.Point(12, 74) + Me.groupBox2.Location = New System.Drawing.Point(12, 84) Me.groupBox2.Name = "groupBox2" - Me.groupBox2.Size = New System.Drawing.Size(735, 80) + Me.groupBox2.Size = New System.Drawing.Size(904, 91) Me.groupBox2.TabIndex = 1 Me.groupBox2.TabStop = false Me.groupBox2.Text = "To Local Time" ' 'lblLocalBackToSource ' - Me.lblLocalBackToSource.Location = New System.Drawing.Point(136, 48) + Me.lblLocalBackToSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblLocalBackToSource.Location = New System.Drawing.Point(213, 56) Me.lblLocalBackToSource.Name = "lblLocalBackToSource" Me.lblLocalBackToSource.Size = New System.Drawing.Size(580, 23) Me.lblLocalBackToSource.TabIndex = 3 @@ -117,16 +118,17 @@ Partial Class VTimeZoneTestForm ' 'label5 ' - Me.label5.Location = New System.Drawing.Point(6, 48) + Me.label5.Location = New System.Drawing.Point(6, 56) Me.label5.Name = "label5" - Me.label5.Size = New System.Drawing.Size(118, 23) + Me.label5.Size = New System.Drawing.Size(201, 23) Me.label5.TabIndex = 2 Me.label5.Text = "Back to Source" Me.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'lblLocalTime ' - Me.lblLocalTime.Location = New System.Drawing.Point(136, 24) + Me.lblLocalTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblLocalTime.Location = New System.Drawing.Point(213, 24) Me.lblLocalTime.Name = "lblLocalTime" Me.lblLocalTime.Size = New System.Drawing.Size(580, 23) Me.lblLocalTime.TabIndex = 1 @@ -134,9 +136,9 @@ Partial Class VTimeZoneTestForm ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(24, 24) + Me.label2.Location = New System.Drawing.Point(6, 24) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(100, 23) + Me.label2.Size = New System.Drawing.Size(201, 23) Me.label2.TabIndex = 0 Me.label2.Text = "Local Time" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -151,16 +153,17 @@ Partial Class VTimeZoneTestForm Me.groupBox3.Controls.Add(Me.label10) Me.groupBox3.Controls.Add(Me.label6) Me.groupBox3.Controls.Add(Me.cboDestTimeZone) - Me.groupBox3.Location = New System.Drawing.Point(12, 160) + Me.groupBox3.Location = New System.Drawing.Point(12, 181) Me.groupBox3.Name = "groupBox3" - Me.groupBox3.Size = New System.Drawing.Size(735, 112) + Me.groupBox3.Size = New System.Drawing.Size(904, 137) Me.groupBox3.TabIndex = 2 Me.groupBox3.TabStop = false Me.groupBox3.Text = "To Other Time Zone" ' 'lblDestBackToSource ' - Me.lblDestBackToSource.Location = New System.Drawing.Point(132, 80) + Me.lblDestBackToSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblDestBackToSource.Location = New System.Drawing.Point(213, 100) Me.lblDestBackToSource.Name = "lblDestBackToSource" Me.lblDestBackToSource.Size = New System.Drawing.Size(580, 23) Me.lblDestBackToSource.TabIndex = 5 @@ -168,16 +171,17 @@ Partial Class VTimeZoneTestForm ' 'label8 ' - Me.label8.Location = New System.Drawing.Point(3, 80) + Me.label8.Location = New System.Drawing.Point(8, 100) Me.label8.Name = "label8" - Me.label8.Size = New System.Drawing.Size(121, 23) + Me.label8.Size = New System.Drawing.Size(199, 23) Me.label8.TabIndex = 4 Me.label8.Text = "Back to Source" Me.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'lblDestTime ' - Me.lblDestTime.Location = New System.Drawing.Point(132, 56) + Me.lblDestTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblDestTime.Location = New System.Drawing.Point(213, 67) Me.lblDestTime.Name = "lblDestTime" Me.lblDestTime.Size = New System.Drawing.Size(580, 23) Me.lblDestTime.TabIndex = 3 @@ -185,18 +189,18 @@ Partial Class VTimeZoneTestForm ' 'label10 ' - Me.label10.Location = New System.Drawing.Point(24, 56) + Me.label10.Location = New System.Drawing.Point(8, 67) Me.label10.Name = "label10" - Me.label10.Size = New System.Drawing.Size(100, 23) + Me.label10.Size = New System.Drawing.Size(199, 23) Me.label10.TabIndex = 2 Me.label10.Text = "Dest. Time" Me.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'label6 ' - Me.label6.Location = New System.Drawing.Point(8, 24) + Me.label6.Location = New System.Drawing.Point(8, 32) Me.label6.Name = "label6" - Me.label6.Size = New System.Drawing.Size(152, 23) + Me.label6.Size = New System.Drawing.Size(199, 23) Me.label6.TabIndex = 0 Me.label6.Text = "Destination &Time Zone" Me.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -206,19 +210,19 @@ Partial Class VTimeZoneTestForm Me.cboDestTimeZone.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.cboDestTimeZone.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDestTimeZone.Location = New System.Drawing.Point(168, 24) + Me.cboDestTimeZone.Location = New System.Drawing.Point(213, 30) Me.cboDestTimeZone.MaxDropDownItems = 16 Me.cboDestTimeZone.Name = "cboDestTimeZone" - Me.cboDestTimeZone.Size = New System.Drawing.Size(430, 24) + Me.cboDestTimeZone.Size = New System.Drawing.Size(503, 28) Me.cboDestTimeZone.TabIndex = 1 ' 'btnClose ' Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnClose.Location = New System.Drawing.Point(659, 463) + Me.btnClose.Location = New System.Drawing.Point(816, 463) Me.btnClose.Name = "btnClose" - Me.btnClose.Size = New System.Drawing.Size(88, 32) + Me.btnClose.Size = New System.Drawing.Size(100, 32) Me.btnClose.TabIndex = 6 Me.btnClose.Text = "&Close" ' @@ -227,17 +231,17 @@ Partial Class VTimeZoneTestForm Me.txtTimeZoneInfo.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.txtTimeZoneInfo.Location = New System.Drawing.Point(12, 312) + Me.txtTimeZoneInfo.Location = New System.Drawing.Point(12, 347) Me.txtTimeZoneInfo.Multiline = true Me.txtTimeZoneInfo.Name = "txtTimeZoneInfo" Me.txtTimeZoneInfo.ReadOnly = true Me.txtTimeZoneInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtTimeZoneInfo.Size = New System.Drawing.Size(735, 143) + Me.txtTimeZoneInfo.Size = New System.Drawing.Size(904, 108) Me.txtTimeZoneInfo.TabIndex = 4 ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(12, 286) + Me.label3.Location = New System.Drawing.Point(8, 321) Me.label3.Name = "label3" Me.label3.Size = New System.Drawing.Size(160, 23) Me.label3.TabIndex = 3 @@ -248,14 +252,14 @@ Partial Class VTimeZoneTestForm Me.btnSaveTZs.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.btnSaveTZs.Location = New System.Drawing.Point(12, 463) Me.btnSaveTZs.Name = "btnSaveTZs" - Me.btnSaveTZs.Size = New System.Drawing.Size(88, 32) + Me.btnSaveTZs.Size = New System.Drawing.Size(100, 32) Me.btnSaveTZs.TabIndex = 5 Me.btnSaveTZs.Text = "&Save TZs" ' 'VTimeZoneTestForm ' Me.CancelButton = Me.btnClose - Me.ClientSize = New System.Drawing.Size(759, 507) + Me.ClientSize = New System.Drawing.Size(928, 507) Me.Controls.Add(Me.btnSaveTZs) Me.Controls.Add(Me.label3) Me.Controls.Add(Me.txtTimeZoneInfo) diff --git a/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.vb b/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.vb index 12c09fc..5199c26 100644 --- a/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.vb +++ b/Source/VBNetDemos/PDIWinFormsTest/VTimeZoneTestForm.vb @@ -19,7 +19,6 @@ ' 12/02/2004 EFW Created the code '================================================================================================================ -Imports System.ComponentModel Imports System.Globalization Imports System.IO diff --git a/Source/VBNetDemos/vCardBrowser/AboutDlg.Designer.vb b/Source/VBNetDemos/vCardBrowser/AboutDlg.Designer.vb index b6f933b..a8a28db 100644 --- a/Source/VBNetDemos/vCardBrowser/AboutDlg.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/AboutDlg.Designer.vb @@ -41,9 +41,9 @@ Partial Class AboutDlg ' 'lnkHelp ' - Me.lnkHelp.Location = New System.Drawing.Point(168, 301) + Me.lnkHelp.Location = New System.Drawing.Point(187, 334) Me.lnkHelp.Name = "lnkHelp" - Me.lnkHelp.Size = New System.Drawing.Size(144, 18) + Me.lnkHelp.Size = New System.Drawing.Size(216, 23) Me.lnkHelp.TabIndex = 6 Me.lnkHelp.TabStop = true Me.lnkHelp.Text = "Eric@EWoodruff.us" @@ -51,22 +51,22 @@ Partial Class AboutDlg 'ColumnHeader1 ' Me.ColumnHeader1.Text = "Name" - Me.ColumnHeader1.Width = 250 + Me.ColumnHeader1.Width = 275 ' 'btnSysInfo ' - Me.btnSysInfo.Location = New System.Drawing.Point(334, 349) + Me.btnSysInfo.Location = New System.Drawing.Point(355, 398) Me.btnSysInfo.Name = "btnSysInfo" - Me.btnSysInfo.Size = New System.Drawing.Size(112, 32) + Me.btnSysInfo.Size = New System.Drawing.Size(150, 32) Me.btnSysInfo.TabIndex = 9 Me.btnSysInfo.Text = "System Info..." ' 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(216, 349) + Me.btnOK.Location = New System.Drawing.Point(199, 398) Me.btnOK.Name = "btnOK" - Me.btnOK.Size = New System.Drawing.Size(112, 32) + Me.btnOK.Size = New System.Drawing.Size(150, 32) Me.btnOK.TabIndex = 8 Me.btnOK.Text = "OK" ' @@ -76,10 +76,10 @@ Partial Class AboutDlg Me.lvComponents.FullRowSelect = true Me.lvComponents.GridLines = true Me.lvComponents.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable - Me.lvComponents.Location = New System.Drawing.Point(12, 128) + Me.lvComponents.Location = New System.Drawing.Point(12, 153) Me.lvComponents.MultiSelect = false Me.lvComponents.Name = "lvComponents" - Me.lvComponents.Size = New System.Drawing.Size(434, 170) + Me.lvComponents.Size = New System.Drawing.Size(493, 170) Me.lvComponents.TabIndex = 4 Me.lvComponents.UseCompatibleStateImageBehavior = false Me.lvComponents.View = System.Windows.Forms.View.Details @@ -91,9 +91,9 @@ Partial Class AboutDlg ' 'Label1 ' - Me.Label1.Location = New System.Drawing.Point(12, 106) + Me.Label1.Location = New System.Drawing.Point(8, 127) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(164, 19) + Me.Label1.Size = New System.Drawing.Size(164, 23) Me.Label1.TabIndex = 3 Me.Label1.Text = "Product Components" ' @@ -101,23 +101,23 @@ Partial Class AboutDlg ' Me.lblName.Location = New System.Drawing.Point(80, 8) Me.lblName.Name = "lblName" - Me.lblName.Size = New System.Drawing.Size(366, 19) + Me.lblName.Size = New System.Drawing.Size(425, 23) Me.lblName.TabIndex = 0 Me.lblName.Text = "" ' 'lblDescription ' - Me.lblDescription.Location = New System.Drawing.Point(80, 56) + Me.lblDescription.Location = New System.Drawing.Point(80, 64) Me.lblDescription.Name = "lblDescription" - Me.lblDescription.Size = New System.Drawing.Size(366, 40) + Me.lblDescription.Size = New System.Drawing.Size(425, 67) Me.lblDescription.TabIndex = 2 Me.lblDescription.Text = "" ' 'lblCopyright ' - Me.lblCopyright.Location = New System.Drawing.Point(12, 327) + Me.lblCopyright.Location = New System.Drawing.Point(12, 364) Me.lblCopyright.Name = "lblCopyright" - Me.lblCopyright.Size = New System.Drawing.Size(434, 19) + Me.lblCopyright.Size = New System.Drawing.Size(493, 23) Me.lblCopyright.TabIndex = 7 Me.lblCopyright.Text = "" ' @@ -133,17 +133,17 @@ Partial Class AboutDlg ' 'lblVersion ' - Me.lblVersion.Location = New System.Drawing.Point(80, 32) + Me.lblVersion.Location = New System.Drawing.Point(80, 36) Me.lblVersion.Name = "lblVersion" - Me.lblVersion.Size = New System.Drawing.Size(366, 19) + Me.lblVersion.Size = New System.Drawing.Size(425, 23) Me.lblVersion.TabIndex = 1 Me.lblVersion.Text = "" ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(12, 301) + Me.label2.Location = New System.Drawing.Point(12, 334) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(162, 19) + Me.label2.Size = New System.Drawing.Size(178, 23) Me.label2.TabIndex = 5 Me.label2.Text = "For help send e-mail to" ' @@ -151,7 +151,7 @@ Partial Class AboutDlg ' Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnOK - Me.ClientSize = New System.Drawing.Size(458, 393) + Me.ClientSize = New System.Drawing.Size(517, 442) Me.Controls.Add(Me.lnkHelp) Me.Controls.Add(Me.label2) Me.Controls.Add(Me.btnSysInfo) diff --git a/Source/VBNetDemos/vCardBrowser/AboutDlg.vb b/Source/VBNetDemos/vCardBrowser/AboutDlg.vb index ea8cbe3..7b2808c 100644 --- a/Source/VBNetDemos/vCardBrowser/AboutDlg.vb +++ b/Source/VBNetDemos/vCardBrowser/AboutDlg.vb @@ -1,9 +1,9 @@ '================================================================================================================ ' File : AboutDlg.vb ' Author : Eric Woodruff -' Updated : 01/02/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved -' Compiler: Microsoft Visual C# +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved +' Compiler: Microsoft VB.NET ' ' This form is used to display application version information ' @@ -17,6 +17,8 @@ ' 12/03/2004 EFW Created the code '================================================================================================================ +' Ignore Spelling: mailto + Imports System.Reflection Public Partial Class AboutDlg @@ -69,9 +71,8 @@ Public Partial Class AboutDlg End Try End Sub - Private Sub lnkHelp_LinkClicked(ByVal sender As System.Object, ByVal e As LinkLabelLinkClickedEventArgs) _ - Handles lnkHelp.LinkClicked - + Private Sub lnkHelp_LinkClicked(ByVal sender As System.Object, + ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles lnkHelp.LinkClicked Try ' Launch the e-mail URL, this will fail if user does not have an association for e-mail URLs System.Diagnostics.Process.Start(DirectCast(e.Link.LinkData, String)) diff --git a/Source/VBNetDemos/vCardBrowser/AddressControl.Designer.vb b/Source/VBNetDemos/vCardBrowser/AddressControl.Designer.vb index e9c30f2..af6505c 100644 --- a/Source/VBNetDemos/vCardBrowser/AddressControl.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/AddressControl.Designer.vb @@ -75,181 +75,181 @@ Partial Class AddressControl Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(664, 193) + Me.pnlControls.Size = New System.Drawing.Size(685, 212) Me.pnlControls.TabIndex = 0 ' 'btnMap ' - Me.btnMap.Location = New System.Drawing.Point(266, 102) + Me.btnMap.Location = New System.Drawing.Point(298, 104) Me.btnMap.Name = "btnMap" - Me.btnMap.Size = New System.Drawing.Size(60, 28) + Me.btnMap.Size = New System.Drawing.Size(75, 28) Me.btnMap.TabIndex = 14 Me.btnMap.Text = "&Map" ' 'chkPreferred ' - Me.chkPreferred.Location = New System.Drawing.Point(556, 145) + Me.chkPreferred.Location = New System.Drawing.Point(397, 176) Me.chkPreferred.Name = "chkPreferred" - Me.chkPreferred.Size = New System.Drawing.Size(96, 24) + Me.chkPreferred.Size = New System.Drawing.Size(137, 24) Me.chkPreferred.TabIndex = 21 Me.chkPreferred.Text = "Preferred" ' 'chkWork ' - Me.chkWork.Location = New System.Drawing.Point(484, 145) + Me.chkWork.Location = New System.Drawing.Point(251, 176) Me.chkWork.Name = "chkWork" - Me.chkWork.Size = New System.Drawing.Size(66, 24) + Me.chkWork.Size = New System.Drawing.Size(137, 24) Me.chkWork.TabIndex = 20 Me.chkWork.Text = "Work" ' 'chkHome ' - Me.chkHome.Location = New System.Drawing.Point(404, 145) + Me.chkHome.Location = New System.Drawing.Point(105, 176) Me.chkHome.Name = "chkHome" - Me.chkHome.Size = New System.Drawing.Size(74, 24) + Me.chkHome.Size = New System.Drawing.Size(137, 24) Me.chkHome.TabIndex = 19 Me.chkHome.Text = "Home" ' 'chkParcel ' - Me.chkParcel.Location = New System.Drawing.Point(324, 145) + Me.chkParcel.Location = New System.Drawing.Point(543, 146) Me.chkParcel.Name = "chkParcel" - Me.chkParcel.Size = New System.Drawing.Size(74, 24) + Me.chkParcel.Size = New System.Drawing.Size(137, 24) Me.chkParcel.TabIndex = 18 Me.chkParcel.Text = "Parcel" ' 'chkPostal ' - Me.chkPostal.Location = New System.Drawing.Point(236, 145) + Me.chkPostal.Location = New System.Drawing.Point(397, 146) Me.chkPostal.Name = "chkPostal" - Me.chkPostal.Size = New System.Drawing.Size(82, 24) + Me.chkPostal.Size = New System.Drawing.Size(137, 24) Me.chkPostal.TabIndex = 17 Me.chkPostal.Text = "Postal" ' 'chkInternational ' - Me.chkInternational.Location = New System.Drawing.Point(116, 145) + Me.chkInternational.Location = New System.Drawing.Point(251, 146) Me.chkInternational.Name = "chkInternational" - Me.chkInternational.Size = New System.Drawing.Size(114, 24) + Me.chkInternational.Size = New System.Drawing.Size(137, 24) Me.chkInternational.TabIndex = 16 Me.chkInternational.Text = "International" ' 'chkDomestic ' - Me.chkDomestic.Location = New System.Drawing.Point(20, 145) + Me.chkDomestic.Location = New System.Drawing.Point(105, 146) Me.chkDomestic.Name = "chkDomestic" - Me.chkDomestic.Size = New System.Drawing.Size(90, 24) + Me.chkDomestic.Size = New System.Drawing.Size(137, 24) Me.chkDomestic.TabIndex = 15 Me.chkDomestic.Text = "Domestic" ' 'txtCountry ' - Me.txtCountry.Location = New System.Drawing.Point(87, 105) + Me.txtCountry.Location = New System.Drawing.Point(105, 105) Me.txtCountry.Name = "txtCountry" - Me.txtCountry.Size = New System.Drawing.Size(168, 22) + Me.txtCountry.Size = New System.Drawing.Size(168, 26) Me.txtCountry.TabIndex = 13 ' 'label18 ' - Me.label18.Location = New System.Drawing.Point(17, 105) + Me.label18.Location = New System.Drawing.Point(7, 107) Me.label18.Name = "label18" - Me.label18.Size = New System.Drawing.Size(64, 23) + Me.label18.Size = New System.Drawing.Size(92, 23) Me.label18.TabIndex = 12 Me.label18.Text = "Country" Me.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtPostalCode ' - Me.txtPostalCode.Location = New System.Drawing.Point(535, 73) + Me.txtPostalCode.Location = New System.Drawing.Point(593, 73) Me.txtPostalCode.Name = "txtPostalCode" - Me.txtPostalCode.Size = New System.Drawing.Size(80, 22) + Me.txtPostalCode.Size = New System.Drawing.Size(80, 26) Me.txtPostalCode.TabIndex = 11 ' 'label17 ' - Me.label17.Location = New System.Drawing.Point(439, 73) + Me.label17.Location = New System.Drawing.Point(478, 75) Me.label17.Name = "label17" - Me.label17.Size = New System.Drawing.Size(90, 23) + Me.label17.Size = New System.Drawing.Size(109, 23) Me.label17.TabIndex = 10 Me.label17.Text = "Postal Code" Me.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtRegion ' - Me.txtRegion.Location = New System.Drawing.Point(351, 73) + Me.txtRegion.Location = New System.Drawing.Point(392, 73) Me.txtRegion.Name = "txtRegion" - Me.txtRegion.Size = New System.Drawing.Size(80, 22) + Me.txtRegion.Size = New System.Drawing.Size(80, 26) Me.txtRegion.TabIndex = 9 ' 'label16 ' - Me.label16.Location = New System.Drawing.Point(265, 73) + Me.label16.Location = New System.Drawing.Point(279, 75) Me.label16.Name = "label16" - Me.label16.Size = New System.Drawing.Size(80, 23) + Me.label16.Size = New System.Drawing.Size(107, 23) Me.label16.TabIndex = 8 Me.label16.Text = "State/Prov" Me.label16.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtLocality ' - Me.txtLocality.Location = New System.Drawing.Point(87, 73) + Me.txtLocality.Location = New System.Drawing.Point(105, 73) Me.txtLocality.Name = "txtLocality" - Me.txtLocality.Size = New System.Drawing.Size(168, 22) + Me.txtLocality.Size = New System.Drawing.Size(168, 26) Me.txtLocality.TabIndex = 7 ' 'label15 ' - Me.label15.Location = New System.Drawing.Point(41, 73) + Me.label15.Location = New System.Drawing.Point(38, 75) Me.label15.Name = "label15" - Me.label15.Size = New System.Drawing.Size(40, 23) + Me.label15.Size = New System.Drawing.Size(61, 23) Me.label15.TabIndex = 6 Me.label15.Text = "City" Me.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtPOBox ' - Me.txtPOBox.Location = New System.Drawing.Point(511, 9) + Me.txtPOBox.Location = New System.Drawing.Point(565, 9) Me.txtPOBox.Name = "txtPOBox" - Me.txtPOBox.Size = New System.Drawing.Size(144, 22) + Me.txtPOBox.Size = New System.Drawing.Size(108, 26) Me.txtPOBox.TabIndex = 3 ' 'label14 ' - Me.label14.Location = New System.Drawing.Point(449, 9) + Me.label14.Location = New System.Drawing.Point(482, 11) Me.label14.Name = "label14" - Me.label14.Size = New System.Drawing.Size(56, 23) + Me.label14.Size = New System.Drawing.Size(77, 23) Me.label14.TabIndex = 2 Me.label14.Text = "PO Box" Me.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtExtendedAddress ' - Me.txtExtendedAddress.Location = New System.Drawing.Point(87, 41) + Me.txtExtendedAddress.Location = New System.Drawing.Point(105, 41) Me.txtExtendedAddress.Name = "txtExtendedAddress" - Me.txtExtendedAddress.Size = New System.Drawing.Size(344, 22) + Me.txtExtendedAddress.Size = New System.Drawing.Size(367, 26) Me.txtExtendedAddress.TabIndex = 5 ' 'label13 ' - Me.label13.Location = New System.Drawing.Point(9, 41) + Me.label13.Location = New System.Drawing.Point(3, 43) Me.label13.Name = "label13" - Me.label13.Size = New System.Drawing.Size(72, 23) + Me.label13.Size = New System.Drawing.Size(96, 23) Me.label13.TabIndex = 4 Me.label13.Text = "Address 2" Me.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtStreetAddress ' - Me.txtStreetAddress.Location = New System.Drawing.Point(87, 9) + Me.txtStreetAddress.Location = New System.Drawing.Point(105, 9) Me.txtStreetAddress.Name = "txtStreetAddress" - Me.txtStreetAddress.Size = New System.Drawing.Size(344, 22) + Me.txtStreetAddress.Size = New System.Drawing.Size(367, 26) Me.txtStreetAddress.TabIndex = 1 ' 'label12 ' - Me.label12.Location = New System.Drawing.Point(9, 9) + Me.label12.Location = New System.Drawing.Point(3, 11) Me.label12.Name = "label12" - Me.label12.Size = New System.Drawing.Size(72, 23) + Me.label12.Size = New System.Drawing.Size(96, 23) Me.label12.TabIndex = 0 Me.label12.Text = "&Address 1" Me.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -258,7 +258,7 @@ Partial Class AddressControl ' Me.Controls.Add(Me.pnlControls) Me.Name = "AddressControl" - Me.Size = New System.Drawing.Size(664, 220) + Me.Size = New System.Drawing.Size(685, 240) Me.Controls.SetChildIndex(Me.pnlControls, 0) Me.pnlControls.ResumeLayout(false) Me.pnlControls.PerformLayout diff --git a/Source/VBNetDemos/vCardBrowser/AddressControl.vb b/Source/VBNetDemos/vCardBrowser/AddressControl.vb index 319b214..7799ad6 100644 --- a/Source/VBNetDemos/vCardBrowser/AddressControl.vb +++ b/Source/VBNetDemos/vCardBrowser/AddressControl.vb @@ -25,7 +25,6 @@ Imports System.Text Imports System.Web Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms ''' ''' A user control for editing vCard mailing addresses diff --git a/Source/VBNetDemos/vCardBrowser/EMailControl.Designer.vb b/Source/VBNetDemos/vCardBrowser/EMailControl.Designer.vb index 2da83f0..3a1e20f 100644 --- a/Source/VBNetDemos/vCardBrowser/EMailControl.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/EMailControl.Designer.vb @@ -43,53 +43,53 @@ Partial Class EMailControl Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(470, 77) + Me.pnlControls.Size = New System.Drawing.Size(532, 76) Me.pnlControls.TabIndex = 0 ' 'chkPreferred ' - Me.chkPreferred.Location = New System.Drawing.Point(346, 44) + Me.chkPreferred.Location = New System.Drawing.Point(386, 44) Me.chkPreferred.Name = "chkPreferred" - Me.chkPreferred.Size = New System.Drawing.Size(98, 24) + Me.chkPreferred.Size = New System.Drawing.Size(120, 24) Me.chkPreferred.TabIndex = 5 Me.chkPreferred.Text = "Preferred" ' 'chkX400 ' - Me.chkX400.Location = New System.Drawing.Point(256, 44) + Me.chkX400.Location = New System.Drawing.Point(281, 44) Me.chkX400.Name = "chkX400" - Me.chkX400.Size = New System.Drawing.Size(72, 24) + Me.chkX400.Size = New System.Drawing.Size(99, 24) Me.chkX400.TabIndex = 4 Me.chkX400.Text = "X400" ' 'chkInternet ' - Me.chkInternet.Location = New System.Drawing.Point(136, 44) + Me.chkInternet.Location = New System.Drawing.Point(173, 44) Me.chkInternet.Name = "chkInternet" - Me.chkInternet.Size = New System.Drawing.Size(104, 24) + Me.chkInternet.Size = New System.Drawing.Size(102, 24) Me.chkInternet.TabIndex = 3 Me.chkInternet.Text = "Internet" ' 'chkAOL ' - Me.chkAOL.Location = New System.Drawing.Point(36, 44) + Me.chkAOL.Location = New System.Drawing.Point(76, 44) Me.chkAOL.Name = "chkAOL" - Me.chkAOL.Size = New System.Drawing.Size(84, 24) + Me.chkAOL.Size = New System.Drawing.Size(91, 24) Me.chkAOL.TabIndex = 2 Me.chkAOL.Text = "AOL" ' 'txtEMailAddress ' - Me.txtEMailAddress.Location = New System.Drawing.Point(76, 12) + Me.txtEMailAddress.Location = New System.Drawing.Point(76, 10) Me.txtEMailAddress.Name = "txtEMailAddress" - Me.txtEMailAddress.Size = New System.Drawing.Size(368, 22) + Me.txtEMailAddress.Size = New System.Drawing.Size(430, 26) Me.txtEMailAddress.TabIndex = 1 ' 'label12 ' - Me.label12.Location = New System.Drawing.Point(15, 12) + Me.label12.Location = New System.Drawing.Point(1, 12) Me.label12.Name = "label12" - Me.label12.Size = New System.Drawing.Size(55, 23) + Me.label12.Size = New System.Drawing.Size(69, 23) Me.label12.TabIndex = 0 Me.label12.Text = "&E-Mail" Me.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -98,7 +98,7 @@ Partial Class EMailControl ' Me.Controls.Add(Me.pnlControls) Me.Name = "EMailControl" - Me.Size = New System.Drawing.Size(470, 104) + Me.Size = New System.Drawing.Size(532, 104) Me.Controls.SetChildIndex(Me.pnlControls, 0) Me.pnlControls.ResumeLayout(false) Me.pnlControls.PerformLayout diff --git a/Source/VBNetDemos/vCardBrowser/EMailControl.vb b/Source/VBNetDemos/vCardBrowser/EMailControl.vb index b949d4e..31865d8 100644 --- a/Source/VBNetDemos/vCardBrowser/EMailControl.vb +++ b/Source/VBNetDemos/vCardBrowser/EMailControl.vb @@ -24,7 +24,6 @@ Imports System.ComponentModel Imports System.Text.RegularExpressions Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms ''' ''' A user control for editing vCard e-mail addresses diff --git a/Source/VBNetDemos/vCardBrowser/LabelControl.Designer.vb b/Source/VBNetDemos/vCardBrowser/LabelControl.Designer.vb index 9d4a883..0e5a737 100644 --- a/Source/VBNetDemos/vCardBrowser/LabelControl.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/LabelControl.Designer.vb @@ -49,54 +49,54 @@ Partial Class LabelControl Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(464, 173) + Me.pnlControls.Size = New System.Drawing.Size(648, 172) Me.pnlControls.TabIndex = 0 ' 'chkPreferred ' - Me.chkPreferred.Location = New System.Drawing.Point(286, 140) + Me.chkPreferred.Location = New System.Drawing.Point(356, 138) Me.chkPreferred.Name = "chkPreferred" - Me.chkPreferred.Size = New System.Drawing.Size(96, 24) + Me.chkPreferred.Size = New System.Drawing.Size(137, 24) Me.chkPreferred.TabIndex = 8 Me.chkPreferred.Text = "Preferred" ' 'chkWork ' - Me.chkWork.Location = New System.Drawing.Point(166, 140) + Me.chkWork.Location = New System.Drawing.Point(213, 138) Me.chkWork.Name = "chkWork" - Me.chkWork.Size = New System.Drawing.Size(72, 24) + Me.chkWork.Size = New System.Drawing.Size(137, 24) Me.chkWork.TabIndex = 7 Me.chkWork.Text = "Work" ' 'chkHome ' - Me.chkHome.Location = New System.Drawing.Point(70, 140) + Me.chkHome.Location = New System.Drawing.Point(70, 138) Me.chkHome.Name = "chkHome" - Me.chkHome.Size = New System.Drawing.Size(78, 24) + Me.chkHome.Size = New System.Drawing.Size(137, 24) Me.chkHome.TabIndex = 6 Me.chkHome.Text = "Home" ' 'chkParcel ' - Me.chkParcel.Location = New System.Drawing.Point(372, 108) + Me.chkParcel.Location = New System.Drawing.Point(499, 108) Me.chkParcel.Name = "chkParcel" - Me.chkParcel.Size = New System.Drawing.Size(78, 24) + Me.chkParcel.Size = New System.Drawing.Size(137, 24) Me.chkParcel.TabIndex = 5 Me.chkParcel.Text = "Parcel" ' 'chkPostal ' - Me.chkPostal.Location = New System.Drawing.Point(286, 108) + Me.chkPostal.Location = New System.Drawing.Point(356, 108) Me.chkPostal.Name = "chkPostal" - Me.chkPostal.Size = New System.Drawing.Size(80, 24) + Me.chkPostal.Size = New System.Drawing.Size(137, 24) Me.chkPostal.TabIndex = 4 Me.chkPostal.Text = "Postal" ' 'chkInternational ' - Me.chkInternational.Location = New System.Drawing.Point(166, 108) + Me.chkInternational.Location = New System.Drawing.Point(213, 108) Me.chkInternational.Name = "chkInternational" - Me.chkInternational.Size = New System.Drawing.Size(114, 24) + Me.chkInternational.Size = New System.Drawing.Size(137, 24) Me.chkInternational.TabIndex = 3 Me.chkInternational.Text = "International" ' @@ -104,7 +104,7 @@ Partial Class LabelControl ' Me.chkDomestic.Location = New System.Drawing.Point(70, 108) Me.chkDomestic.Name = "chkDomestic" - Me.chkDomestic.Size = New System.Drawing.Size(90, 24) + Me.chkDomestic.Size = New System.Drawing.Size(137, 24) Me.chkDomestic.TabIndex = 2 Me.chkDomestic.Text = "Domestic" ' @@ -115,14 +115,14 @@ Partial Class LabelControl Me.txtLabelText.Multiline = true Me.txtLabelText.Name = "txtLabelText" Me.txtLabelText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtLabelText.Size = New System.Drawing.Size(368, 88) + Me.txtLabelText.Size = New System.Drawing.Size(566, 88) Me.txtLabelText.TabIndex = 1 ' 'label12 ' - Me.label12.Location = New System.Drawing.Point(14, 12) + Me.label12.Location = New System.Drawing.Point(3, 12) Me.label12.Name = "label12" - Me.label12.Size = New System.Drawing.Size(48, 23) + Me.label12.Size = New System.Drawing.Size(59, 23) Me.label12.TabIndex = 0 Me.label12.Text = "&Label" Me.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -131,7 +131,7 @@ Partial Class LabelControl ' Me.Controls.Add(Me.pnlControls) Me.Name = "LabelControl" - Me.Size = New System.Drawing.Size(464, 200) + Me.Size = New System.Drawing.Size(648, 200) Me.Controls.SetChildIndex(Me.pnlControls, 0) Me.pnlControls.ResumeLayout(false) Me.pnlControls.PerformLayout diff --git a/Source/VBNetDemos/vCardBrowser/LabelControl.vb b/Source/VBNetDemos/vCardBrowser/LabelControl.vb index 644eef7..0fdf471 100644 --- a/Source/VBNetDemos/vCardBrowser/LabelControl.vb +++ b/Source/VBNetDemos/vCardBrowser/LabelControl.vb @@ -4,7 +4,7 @@ ' Author : Eric Woodruff (Eric@EWoodruff.us) ' Updated : 01/02/2015 ' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved -' Compiler: Visual C# +' Compiler: Microsoft VB.NET ' ' This is used to edit a vCard's label information. It's nothing elaborate but does let you edit the collection ' fairly well. @@ -23,7 +23,6 @@ Imports System.ComponentModel Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms ''' ''' A user control for editing vCard mailing labels diff --git a/Source/VBNetDemos/vCardBrowser/PhoneControl.Designer.vb b/Source/VBNetDemos/vCardBrowser/PhoneControl.Designer.vb index c9760fc..c788cf2 100644 --- a/Source/VBNetDemos/vCardBrowser/PhoneControl.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/PhoneControl.Designer.vb @@ -51,85 +51,85 @@ Partial Class PhoneControl Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(470, 101) + Me.pnlControls.Size = New System.Drawing.Size(673, 100) Me.pnlControls.TabIndex = 0 ' 'chkPager ' - Me.chkPager.Location = New System.Drawing.Point(246, 70) + Me.chkPager.Location = New System.Drawing.Point(381, 70) Me.chkPager.Name = "chkPager" - Me.chkPager.Size = New System.Drawing.Size(86, 24) + Me.chkPager.Size = New System.Drawing.Size(137, 24) Me.chkPager.TabIndex = 8 Me.chkPager.Text = "Pager" ' 'chkPreferred ' - Me.chkPreferred.Location = New System.Drawing.Point(366, 70) + Me.chkPreferred.Location = New System.Drawing.Point(524, 70) Me.chkPreferred.Name = "chkPreferred" - Me.chkPreferred.Size = New System.Drawing.Size(101, 24) + Me.chkPreferred.Size = New System.Drawing.Size(137, 24) Me.chkPreferred.TabIndex = 9 Me.chkPreferred.Text = "Preferred" ' 'chkWork ' - Me.chkWork.Location = New System.Drawing.Point(14, 40) + Me.chkWork.Location = New System.Drawing.Point(95, 40) Me.chkWork.Name = "chkWork" - Me.chkWork.Size = New System.Drawing.Size(78, 24) + Me.chkWork.Size = New System.Drawing.Size(137, 24) Me.chkWork.TabIndex = 2 Me.chkWork.Text = "Work" ' 'chkHome ' - Me.chkHome.Location = New System.Drawing.Point(126, 40) + Me.chkHome.Location = New System.Drawing.Point(238, 40) Me.chkHome.Name = "chkHome" - Me.chkHome.Size = New System.Drawing.Size(88, 24) + Me.chkHome.Size = New System.Drawing.Size(137, 24) Me.chkHome.TabIndex = 3 Me.chkHome.Text = "Home" ' 'chkCell ' - Me.chkCell.Location = New System.Drawing.Point(126, 70) + Me.chkCell.Location = New System.Drawing.Point(238, 70) Me.chkCell.Name = "chkCell" - Me.chkCell.Size = New System.Drawing.Size(64, 24) + Me.chkCell.Size = New System.Drawing.Size(137, 24) Me.chkCell.TabIndex = 7 Me.chkCell.Text = "Cell" ' 'chkMessage ' - Me.chkMessage.Location = New System.Drawing.Point(14, 70) + Me.chkMessage.Location = New System.Drawing.Point(95, 70) Me.chkMessage.Name = "chkMessage" - Me.chkMessage.Size = New System.Drawing.Size(88, 24) + Me.chkMessage.Size = New System.Drawing.Size(137, 24) Me.chkMessage.TabIndex = 6 Me.chkMessage.Text = "Message" ' 'chkFax ' - Me.chkFax.Location = New System.Drawing.Point(366, 40) + Me.chkFax.Location = New System.Drawing.Point(524, 40) Me.chkFax.Name = "chkFax" - Me.chkFax.Size = New System.Drawing.Size(56, 24) + Me.chkFax.Size = New System.Drawing.Size(137, 24) Me.chkFax.TabIndex = 5 Me.chkFax.Text = "Fax" ' 'chkVoice ' - Me.chkVoice.Location = New System.Drawing.Point(246, 40) + Me.chkVoice.Location = New System.Drawing.Point(381, 40) Me.chkVoice.Name = "chkVoice" - Me.chkVoice.Size = New System.Drawing.Size(86, 24) + Me.chkVoice.Size = New System.Drawing.Size(137, 24) Me.chkVoice.TabIndex = 4 Me.chkVoice.Text = "Voice" ' 'txtPhoneNumber ' - Me.txtPhoneNumber.Location = New System.Drawing.Point(78, 8) + Me.txtPhoneNumber.Location = New System.Drawing.Point(95, 8) Me.txtPhoneNumber.Name = "txtPhoneNumber" - Me.txtPhoneNumber.Size = New System.Drawing.Size(368, 22) + Me.txtPhoneNumber.Size = New System.Drawing.Size(566, 26) Me.txtPhoneNumber.TabIndex = 1 ' 'label12 ' - Me.label12.Location = New System.Drawing.Point(6, 8) + Me.label12.Location = New System.Drawing.Point(5, 10) Me.label12.Name = "label12" - Me.label12.Size = New System.Drawing.Size(64, 23) + Me.label12.Size = New System.Drawing.Size(84, 23) Me.label12.TabIndex = 0 Me.label12.Text = "&Phone #" Me.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -138,7 +138,7 @@ Partial Class PhoneControl ' Me.Controls.Add(Me.pnlControls) Me.Name = "PhoneControl" - Me.Size = New System.Drawing.Size(470, 128) + Me.Size = New System.Drawing.Size(673, 128) Me.Controls.SetChildIndex(Me.pnlControls, 0) Me.pnlControls.ResumeLayout(false) Me.pnlControls.PerformLayout diff --git a/Source/VBNetDemos/vCardBrowser/PhoneControl.vb b/Source/VBNetDemos/vCardBrowser/PhoneControl.vb index 5510372..1f263c4 100644 --- a/Source/VBNetDemos/vCardBrowser/PhoneControl.vb +++ b/Source/VBNetDemos/vCardBrowser/PhoneControl.vb @@ -4,7 +4,7 @@ ' Author : Eric Woodruff (Eric@EWoodruff.us) ' Updated : 01/02/2015 ' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved -' Compiler: Visual C# +' Compiler: Microsoft VB.NET ' ' This is used to edit a vCard's phone information. It's nothing elaborate but does let you edit the collection ' fairly well. @@ -23,7 +23,6 @@ Imports System.ComponentModel Imports EWSoftware.PDI.Properties -Imports EWSoftware.PDI.Windows.Forms ''' ''' A user control for editing vCard phone numbers diff --git a/Source/VBNetDemos/vCardBrowser/PhotoControl.Designer.vb b/Source/VBNetDemos/vCardBrowser/PhotoControl.Designer.vb index d8a3aca..f566ac8 100644 --- a/Source/VBNetDemos/vCardBrowser/PhotoControl.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/PhotoControl.Designer.vb @@ -47,41 +47,41 @@ Partial Class PhotoControl ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(214, 8) + Me.label1.Location = New System.Drawing.Point(218, 19) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(52, 23) + Me.label1.Size = New System.Drawing.Size(63, 23) Me.label1.TabIndex = 0 Me.label1.Text = "&Name" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtFilename ' - Me.txtFilename.Location = New System.Drawing.Point(272, 8) + Me.txtFilename.Location = New System.Drawing.Point(287, 17) Me.txtFilename.Name = "txtFilename" - Me.txtFilename.Size = New System.Drawing.Size(280, 22) + Me.txtFilename.Size = New System.Drawing.Size(280, 26) Me.txtFilename.TabIndex = 1 ' 'btnLoad ' - Me.btnLoad.Location = New System.Drawing.Point(552, 7) + Me.btnLoad.Location = New System.Drawing.Point(573, 16) Me.btnLoad.Name = "btnLoad" - Me.btnLoad.Size = New System.Drawing.Size(28, 23) + Me.btnLoad.Size = New System.Drawing.Size(35, 28) Me.btnLoad.TabIndex = 2 Me.btnLoad.Text = "..." ' 'chkInline ' - Me.chkInline.Location = New System.Drawing.Point(272, 40) + Me.chkInline.Location = New System.Drawing.Point(287, 49) Me.chkInline.Name = "chkInline" - Me.chkInline.Size = New System.Drawing.Size(192, 24) + Me.chkInline.Size = New System.Drawing.Size(280, 24) Me.chkInline.TabIndex = 3 Me.chkInline.Text = "Store image in vCard" ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(217, 72) + Me.label2.Location = New System.Drawing.Point(219, 81) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(49, 23) + Me.label2.Size = New System.Drawing.Size(62, 23) Me.label2.TabIndex = 4 Me.label2.Text = "Type" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -89,10 +89,10 @@ Partial Class PhotoControl 'cboImageType ' Me.cboImageType.Items.AddRange(New Object() {"GIF", "CGM", "WMF", "BMP", "MET", "PMB", "DIB", "PICT", "TIFF", "PS", "PDF", "JPEG", "MPEG", "MPEG2", "AVI", "QTIME", "PNG"}) - Me.cboImageType.Location = New System.Drawing.Point(272, 72) + Me.cboImageType.Location = New System.Drawing.Point(287, 79) Me.cboImageType.MaxDropDownItems = 16 Me.cboImageType.Name = "cboImageType" - Me.cboImageType.Size = New System.Drawing.Size(96, 24) + Me.cboImageType.Size = New System.Drawing.Size(152, 28) Me.cboImageType.TabIndex = 5 ' 'PhotoControl @@ -105,7 +105,7 @@ Partial Class PhotoControl Me.Controls.Add(Me.label1) Me.Controls.Add(Me.pnlPhoto) Me.Name = "PhotoControl" - Me.Size = New System.Drawing.Size(588, 208) + Me.Size = New System.Drawing.Size(619, 208) Me.ResumeLayout(false) Me.PerformLayout diff --git a/Source/VBNetDemos/vCardBrowser/PhotoControl.vb b/Source/VBNetDemos/vCardBrowser/PhotoControl.vb index 2c4329c..3aac5c0 100644 --- a/Source/VBNetDemos/vCardBrowser/PhotoControl.vb +++ b/Source/VBNetDemos/vCardBrowser/PhotoControl.vb @@ -19,6 +19,8 @@ ' 12/06/2004 EFW Created the code '================================================================================================================ +' Ignore Spelling: http https + Imports System.ComponentModel Imports System.IO Imports System.Net diff --git a/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.Designer.vb b/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.Designer.vb index 2a3c2e5..1a37a51 100644 --- a/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.Designer.vb @@ -38,11 +38,6 @@ Partial Class VCardBrowserForm Me.label23 = New System.Windows.Forms.Label() Me.btnApplyVersion = New System.Windows.Forms.Button() Me.dgvCards = New System.Windows.Forms.DataGridView() - Me.tbcVersion = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbcName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbcTitle = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbcOrganization = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbcLastRevision = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblFilename = New System.Windows.Forms.Label() Me.mnuMain = New System.Windows.Forms.MenuStrip() Me.miFile = New System.Windows.Forms.ToolStripMenuItem() @@ -62,6 +57,11 @@ Partial Class VCardBrowserForm Me.menuItem6 = New System.Windows.Forms.ToolStripSeparator() Me.miAbout = New System.Windows.Forms.ToolStripMenuItem() Me.miExit = New System.Windows.Forms.ToolStripMenuItem() + Me.tbcVersion = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbcName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbcTitle = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbcOrganization = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbcLastRevision = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dgvCards,System.ComponentModel.ISupportInitialize).BeginInit Me.mnuMain.SuspendLayout Me.SuspendLayout @@ -98,17 +98,17 @@ Partial Class VCardBrowserForm Me.cboVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.cboVersion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboVersion.Items.AddRange(New Object() {"2.1", "3.0"}) - Me.cboVersion.Location = New System.Drawing.Point(780, 521) + Me.cboVersion.Location = New System.Drawing.Point(771, 519) Me.cboVersion.Name = "cboVersion" - Me.cboVersion.Size = New System.Drawing.Size(56, 24) + Me.cboVersion.Size = New System.Drawing.Size(65, 28) Me.cboVersion.TabIndex = 7 ' 'label23 ' Me.label23.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.label23.Location = New System.Drawing.Point(710, 521) + Me.label23.Location = New System.Drawing.Point(662, 521) Me.label23.Name = "label23" - Me.label23.Size = New System.Drawing.Size(64, 23) + Me.label23.Size = New System.Drawing.Size(103, 23) Me.label23.TabIndex = 6 Me.label23.Text = "&Version" Me.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -140,7 +140,7 @@ Partial Class VCardBrowserForm Me.dgvCards.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.dgvCards.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvCards.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.tbcVersion, Me.tbcName, Me.tbcTitle, Me.tbcOrganization, Me.tbcLastRevision}) - Me.dgvCards.Location = New System.Drawing.Point(12, 51) + Me.dgvCards.Location = New System.Drawing.Point(12, 54) Me.dgvCards.MultiSelect = false Me.dgvCards.Name = "dgvCards" Me.dgvCards.ReadOnly = true @@ -155,51 +155,10 @@ Partial Class VCardBrowserForm Me.dgvCards.RowHeadersWidth = 25 Me.dgvCards.RowTemplate.Height = 24 Me.dgvCards.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvCards.Size = New System.Drawing.Size(918, 459) + Me.dgvCards.Size = New System.Drawing.Size(918, 456) Me.dgvCards.StandardTab = true Me.dgvCards.TabIndex = 2 ' - 'tbcVersion - ' - Me.tbcVersion.DataPropertyName = "Version" - Me.tbcVersion.HeaderText = "Ver" - Me.tbcVersion.Name = "tbcVersion" - Me.tbcVersion.ReadOnly = true - Me.tbcVersion.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.tbcVersion.Width = 45 - ' - 'tbcName - ' - Me.tbcName.DataPropertyName = "Name_SortableName" - Me.tbcName.HeaderText = "Name" - Me.tbcName.Name = "tbcName" - Me.tbcName.ReadOnly = true - Me.tbcName.Width = 250 - ' - 'tbcTitle - ' - Me.tbcTitle.DataPropertyName = "Title_Value" - Me.tbcTitle.HeaderText = "Title" - Me.tbcTitle.Name = "tbcTitle" - Me.tbcTitle.ReadOnly = true - Me.tbcTitle.Width = 200 - ' - 'tbcOrganization - ' - Me.tbcOrganization.DataPropertyName = "Organization_Name" - Me.tbcOrganization.HeaderText = "Organization" - Me.tbcOrganization.Name = "tbcOrganization" - Me.tbcOrganization.ReadOnly = true - Me.tbcOrganization.Width = 200 - ' - 'tbcLastRevision - ' - Me.tbcLastRevision.DataPropertyName = "LastRevision_DateTimeValue" - Me.tbcLastRevision.HeaderText = "Last Revision" - Me.tbcLastRevision.Name = "tbcLastRevision" - Me.tbcLastRevision.ReadOnly = true - Me.tbcLastRevision.Width = 150 - ' 'lblFilename ' Me.lblFilename.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -207,7 +166,7 @@ Partial Class VCardBrowserForm Me.lblFilename.BackColor = System.Drawing.SystemColors.ActiveCaption Me.lblFilename.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.lblFilename.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.lblFilename.Location = New System.Drawing.Point(12, 25) + Me.lblFilename.Location = New System.Drawing.Point(12, 28) Me.lblFilename.Name = "lblFilename" Me.lblFilename.Size = New System.Drawing.Size(918, 23) Me.lblFilename.TabIndex = 1 @@ -220,40 +179,40 @@ Partial Class VCardBrowserForm Me.mnuMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miFile}) Me.mnuMain.Location = New System.Drawing.Point(0, 0) Me.mnuMain.Name = "mnuMain" - Me.mnuMain.Size = New System.Drawing.Size(942, 25) + Me.mnuMain.Size = New System.Drawing.Size(942, 28) Me.mnuMain.TabIndex = 0 ' 'miFile ' Me.miFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miOpen, Me.miSave, Me.menuItem2, Me.miFileEncoding, Me.miPropEncoding, Me.menuItem4, Me.miClear, Me.menuItem6, Me.miAbout, Me.miExit}) Me.miFile.Name = "miFile" - Me.miFile.Size = New System.Drawing.Size(42, 21) + Me.miFile.Size = New System.Drawing.Size(46, 24) Me.miFile.Text = "&File" ' 'miOpen ' Me.miOpen.Name = "miOpen" Me.miOpen.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O),System.Windows.Forms.Keys) - Me.miOpen.Size = New System.Drawing.Size(209, 22) + Me.miOpen.Size = New System.Drawing.Size(252, 30) Me.miOpen.Text = "&Open" ' 'miSave ' Me.miSave.Name = "miSave" Me.miSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S),System.Windows.Forms.Keys) - Me.miSave.Size = New System.Drawing.Size(209, 22) + Me.miSave.Size = New System.Drawing.Size(252, 30) Me.miSave.Text = "&Save" ' 'menuItem2 ' Me.menuItem2.Name = "menuItem2" - Me.menuItem2.Size = New System.Drawing.Size(206, 6) + Me.menuItem2.Size = New System.Drawing.Size(249, 6) ' 'miFileEncoding ' Me.miFileEncoding.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miFileUnicode, Me.miFileWestEuro, Me.miFileASCII}) Me.miFileEncoding.Name = "miFileEncoding" - Me.miFileEncoding.Size = New System.Drawing.Size(209, 22) + Me.miFileEncoding.Size = New System.Drawing.Size(252, 30) Me.miFileEncoding.Text = "File Encoding" ' 'miFileUnicode @@ -261,38 +220,38 @@ Partial Class VCardBrowserForm Me.miFileUnicode.Checked = true Me.miFileUnicode.CheckState = System.Windows.Forms.CheckState.Checked Me.miFileUnicode.Name = "miFileUnicode" - Me.miFileUnicode.Size = New System.Drawing.Size(265, 26) + Me.miFileUnicode.Size = New System.Drawing.Size(302, 30) Me.miFileUnicode.Text = "Unicode (UTF-8)" ' 'miFileWestEuro ' Me.miFileWestEuro.Name = "miFileWestEuro" - Me.miFileWestEuro.Size = New System.Drawing.Size(265, 26) + Me.miFileWestEuro.Size = New System.Drawing.Size(302, 30) Me.miFileWestEuro.Text = "Western European (Windows)" ' 'miFileASCII ' Me.miFileASCII.Name = "miFileASCII" - Me.miFileASCII.Size = New System.Drawing.Size(265, 26) + Me.miFileASCII.Size = New System.Drawing.Size(302, 30) Me.miFileASCII.Text = "ASCII" ' 'miPropEncoding ' Me.miPropEncoding.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.miPropUnicode, Me.miPropWestEuro, Me.miPropASCII}) Me.miPropEncoding.Name = "miPropEncoding" - Me.miPropEncoding.Size = New System.Drawing.Size(209, 22) + Me.miPropEncoding.Size = New System.Drawing.Size(252, 30) Me.miPropEncoding.Text = "Property Encoding" ' 'miPropUnicode ' Me.miPropUnicode.Name = "miPropUnicode" - Me.miPropUnicode.Size = New System.Drawing.Size(265, 26) + Me.miPropUnicode.Size = New System.Drawing.Size(302, 30) Me.miPropUnicode.Text = "Unicode (UTF-8)" ' 'miPropWestEuro ' Me.miPropWestEuro.Name = "miPropWestEuro" - Me.miPropWestEuro.Size = New System.Drawing.Size(265, 26) + Me.miPropWestEuro.Size = New System.Drawing.Size(302, 30) Me.miPropWestEuro.Text = "Western European (Windows)" ' 'miPropASCII @@ -300,37 +259,78 @@ Partial Class VCardBrowserForm Me.miPropASCII.Checked = true Me.miPropASCII.CheckState = System.Windows.Forms.CheckState.Checked Me.miPropASCII.Name = "miPropASCII" - Me.miPropASCII.Size = New System.Drawing.Size(265, 26) + Me.miPropASCII.Size = New System.Drawing.Size(302, 30) Me.miPropASCII.Text = "ASCII" ' 'menuItem4 ' Me.menuItem4.Name = "menuItem4" - Me.menuItem4.Size = New System.Drawing.Size(206, 6) + Me.menuItem4.Size = New System.Drawing.Size(249, 6) ' 'miClear ' Me.miClear.Name = "miClear" - Me.miClear.Size = New System.Drawing.Size(209, 22) + Me.miClear.Size = New System.Drawing.Size(252, 30) Me.miClear.Text = "&Clear" ' 'menuItem6 ' Me.menuItem6.Name = "menuItem6" - Me.menuItem6.Size = New System.Drawing.Size(206, 6) + Me.menuItem6.Size = New System.Drawing.Size(249, 6) ' 'miAbout ' Me.miAbout.Name = "miAbout" - Me.miAbout.Size = New System.Drawing.Size(209, 22) + Me.miAbout.Size = New System.Drawing.Size(252, 30) Me.miAbout.Text = "&About vCard Browser" ' 'miExit ' Me.miExit.Name = "miExit" - Me.miExit.Size = New System.Drawing.Size(209, 22) + Me.miExit.Size = New System.Drawing.Size(252, 30) Me.miExit.Text = "E&xit" ' + 'tbcVersion + ' + Me.tbcVersion.DataPropertyName = "Version" + Me.tbcVersion.HeaderText = "Ver" + Me.tbcVersion.Name = "tbcVersion" + Me.tbcVersion.ReadOnly = true + Me.tbcVersion.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.tbcVersion.Width = 45 + ' + 'tbcName + ' + Me.tbcName.DataPropertyName = "Name_SortableName" + Me.tbcName.HeaderText = "Name" + Me.tbcName.Name = "tbcName" + Me.tbcName.ReadOnly = true + Me.tbcName.Width = 240 + ' + 'tbcTitle + ' + Me.tbcTitle.DataPropertyName = "Title_Value" + Me.tbcTitle.HeaderText = "Title" + Me.tbcTitle.Name = "tbcTitle" + Me.tbcTitle.ReadOnly = true + Me.tbcTitle.Width = 200 + ' + 'tbcOrganization + ' + Me.tbcOrganization.DataPropertyName = "Organization_Name" + Me.tbcOrganization.HeaderText = "Organization" + Me.tbcOrganization.Name = "tbcOrganization" + Me.tbcOrganization.ReadOnly = true + Me.tbcOrganization.Width = 185 + ' + 'tbcLastRevision + ' + Me.tbcLastRevision.DataPropertyName = "LastRevision_DateTimeValue" + Me.tbcLastRevision.HeaderText = "Last Revision" + Me.tbcLastRevision.Name = "tbcLastRevision" + Me.tbcLastRevision.ReadOnly = true + Me.tbcLastRevision.Width = 175 + ' 'VCardBrowserForm ' Me.ClientSize = New System.Drawing.Size(942, 560) @@ -344,6 +344,7 @@ Partial Class VCardBrowserForm Me.Controls.Add(Me.btnEdit) Me.Controls.Add(Me.btnAdd) Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) + Me.MainMenuStrip = Me.mnuMain Me.MinimumSize = New System.Drawing.Size(640, 250) Me.Name = "VCardBrowserForm" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show @@ -364,11 +365,6 @@ End Sub Friend WithEvents label23 As System.Windows.Forms.Label Friend WithEvents btnApplyVersion As System.Windows.Forms.Button Private WithEvents dgvCards As System.Windows.Forms.DataGridView - Private WithEvents tbcVersion As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcName As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcTitle As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcOrganization As System.Windows.Forms.DataGridViewTextBoxColumn - Private WithEvents tbcLastRevision As System.Windows.Forms.DataGridViewTextBoxColumn Private WithEvents lblFilename As System.Windows.Forms.Label Private WithEvents mnuMain As System.Windows.Forms.MenuStrip Private WithEvents miFile As System.Windows.Forms.ToolStripMenuItem @@ -388,5 +384,9 @@ End Sub Private WithEvents menuItem6 As System.Windows.Forms.ToolStripSeparator Private WithEvents miAbout As System.Windows.Forms.ToolStripMenuItem Private WithEvents miExit As System.Windows.Forms.ToolStripMenuItem - + Friend WithEvents tbcVersion As DataGridViewTextBoxColumn + Friend WithEvents tbcName As DataGridViewTextBoxColumn + Friend WithEvents tbcTitle As DataGridViewTextBoxColumn + Friend WithEvents tbcOrganization As DataGridViewTextBoxColumn + Friend WithEvents tbcLastRevision As DataGridViewTextBoxColumn End Class diff --git a/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.vb b/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.vb index b36f4b2..34f9ef1 100644 --- a/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.vb +++ b/Source/VBNetDemos/vCardBrowser/VCardBrowserForm.vb @@ -2,8 +2,8 @@ ' System : EWSoftware PDI Demonstration Applications ' File : VCardBrowserForm.vb ' Author : Eric Woodruff (Eric@EWoodruff.us) -' Updated : 01/02/2015 -' Note : Copyright 2004-2015, Eric Woodruff, All rights reserved +' Updated : 11/25/2018 +' Note : Copyright 2004-2018, Eric Woodruff, All rights reserved ' Compiler: Visual Basic .NET ' ' This is a simple demonstration application that shows how to load, save, and manage a set of vCards including @@ -63,10 +63,11 @@ Public Partial Class VCardBrowserForm tbcVersion.HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter ' The string format to use when drawing the status text - sf = new StringFormat(StringFormatFlags.NoWrap) - sf.Alignment = StringAlignment.Center - sf.LineAlignment = StringAlignment.Center - sf.Trimming = StringTrimming.EllipsisCharacter + sf = new StringFormat(StringFormatFlags.NoWrap) With { + .Alignment = StringAlignment.Center, + .LineAlignment = StringAlignment.Center, + .Trimming = StringTrimming.EllipsisCharacter + } dgvCards.AutoGenerateColumns = False tbcLastRevision.DefaultCellStyle.Format = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern & @@ -119,7 +120,7 @@ Public Partial Class VCardBrowserForm ''' The second vCard to compare ''' Zero if equal, a negative number if X is less than Y, or a ''' positive value if X is greater than Y. - Private Function VCardSorter(ByVal x As VCard, ByVal y As VCard) As Integer + Private Shared Function VCardSorter(ByVal x As VCard, ByVal y As VCard) As Integer Dim sortName1, sortName2 As String ' Get the names to compare. Precedence is given to the SortStringProperty as that is the purpose of its @@ -501,6 +502,8 @@ Public Partial Class VCardBrowserForm ''' The sender of the event ''' The event arguments Private Sub dgvCards_CellDoubleClick( sender As Object, e As DataGridViewCellEventArgs) Handles dgvCards.CellDoubleClick - btnEdit_Click(sender, e) + If e.RowIndex > -1 Then + btnEdit_Click(sender, e) + End If End Sub End Class diff --git a/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.Designer.vb b/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.Designer.vb index 10dbc73..2c8bf6c 100644 --- a/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.Designer.vb +++ b/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.Designer.vb @@ -118,10 +118,10 @@ Partial Class VCardPropertiesDlg Me.tabInfo.Controls.Add(Me.pgOther) Me.tabInfo.Controls.Add(Me.pgPhoto) Me.tabInfo.Controls.Add(Me.pgLogo) - Me.tabInfo.Location = New System.Drawing.Point(12, 72) + Me.tabInfo.Location = New System.Drawing.Point(12, 92) Me.tabInfo.Name = "tabInfo" Me.tabInfo.SelectedIndex = 0 - Me.tabInfo.Size = New System.Drawing.Size(682, 303) + Me.tabInfo.Size = New System.Drawing.Size(721, 322) Me.tabInfo.TabIndex = 8 ' 'pgName @@ -143,9 +143,9 @@ Partial Class VCardPropertiesDlg Me.pgName.Controls.Add(Me.label2) Me.pgName.Controls.Add(Me.txtLastName) Me.pgName.Controls.Add(Me.label1) - Me.pgName.Location = New System.Drawing.Point(4, 25) + Me.pgName.Location = New System.Drawing.Point(4, 29) Me.pgName.Name = "pgName" - Me.pgName.Size = New System.Drawing.Size(674, 274) + Me.pgName.Size = New System.Drawing.Size(713, 289) Me.pgName.TabIndex = 0 Me.pgName.Text = "Name" Me.pgName.UseVisualStyleBackColor = true @@ -154,134 +154,134 @@ Partial Class VCardPropertiesDlg ' Me.groupBox1.Location = New System.Drawing.Point(16, 128) Me.groupBox1.Name = "groupBox1" - Me.groupBox1.Size = New System.Drawing.Size(648, 8) + Me.groupBox1.Size = New System.Drawing.Size(680, 8) Me.groupBox1.TabIndex = 12 Me.groupBox1.TabStop = false ' 'txtSortString ' - Me.txtSortString.Location = New System.Drawing.Point(480, 88) + Me.txtSortString.Location = New System.Drawing.Point(525, 88) Me.txtSortString.Name = "txtSortString" - Me.txtSortString.Size = New System.Drawing.Size(128, 22) + Me.txtSortString.Size = New System.Drawing.Size(128, 26) Me.txtSortString.TabIndex = 11 ' 'label8 ' - Me.label8.Location = New System.Drawing.Point(384, 88) + Me.label8.Location = New System.Drawing.Point(410, 90) Me.label8.Name = "label8" - Me.label8.Size = New System.Drawing.Size(90, 23) + Me.label8.Size = New System.Drawing.Size(109, 23) Me.label8.TabIndex = 10 Me.label8.Text = "Sort String" Me.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtFormattedName ' - Me.txtFormattedName.Location = New System.Drawing.Point(136, 184) + Me.txtFormattedName.Location = New System.Drawing.Point(181, 185) Me.txtFormattedName.Name = "txtFormattedName" - Me.txtFormattedName.Size = New System.Drawing.Size(336, 22) + Me.txtFormattedName.Size = New System.Drawing.Size(336, 26) Me.txtFormattedName.TabIndex = 16 ' 'label7 ' - Me.label7.Location = New System.Drawing.Point(5, 184) + Me.label7.Location = New System.Drawing.Point(16, 187) Me.label7.Name = "label7" - Me.label7.Size = New System.Drawing.Size(125, 23) + Me.label7.Size = New System.Drawing.Size(159, 23) Me.label7.TabIndex = 15 Me.label7.Text = "&Formatted Name" Me.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtNickname ' - Me.txtNickname.Location = New System.Drawing.Point(136, 152) + Me.txtNickname.Location = New System.Drawing.Point(181, 153) Me.txtNickname.Name = "txtNickname" - Me.txtNickname.Size = New System.Drawing.Size(176, 22) + Me.txtNickname.Size = New System.Drawing.Size(176, 26) Me.txtNickname.TabIndex = 14 ' 'label4 ' - Me.label4.Location = New System.Drawing.Point(58, 152) + Me.label4.Location = New System.Drawing.Point(65, 155) Me.label4.Name = "label4" - Me.label4.Size = New System.Drawing.Size(72, 23) + Me.label4.Size = New System.Drawing.Size(110, 23) Me.label4.TabIndex = 13 Me.label4.Text = "&Nickname" Me.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtSuffix ' - Me.txtSuffix.Location = New System.Drawing.Point(480, 56) + Me.txtSuffix.Location = New System.Drawing.Point(525, 56) Me.txtSuffix.Name = "txtSuffix" - Me.txtSuffix.Size = New System.Drawing.Size(128, 22) + Me.txtSuffix.Size = New System.Drawing.Size(128, 26) Me.txtSuffix.TabIndex = 9 ' 'label5 ' - Me.label5.Location = New System.Drawing.Point(418, 56) + Me.label5.Location = New System.Drawing.Point(437, 58) Me.label5.Name = "label5" - Me.label5.Size = New System.Drawing.Size(56, 23) + Me.label5.Size = New System.Drawing.Size(82, 23) Me.label5.TabIndex = 8 Me.label5.Text = "Suffix" Me.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtTitle ' - Me.txtTitle.Location = New System.Drawing.Point(480, 24) + Me.txtTitle.Location = New System.Drawing.Point(525, 24) Me.txtTitle.Name = "txtTitle" - Me.txtTitle.Size = New System.Drawing.Size(128, 22) + Me.txtTitle.Size = New System.Drawing.Size(128, 26) Me.txtTitle.TabIndex = 7 ' 'label6 ' - Me.label6.Location = New System.Drawing.Point(434, 24) + Me.label6.Location = New System.Drawing.Point(433, 26) Me.label6.Name = "label6" - Me.label6.Size = New System.Drawing.Size(40, 23) + Me.label6.Size = New System.Drawing.Size(86, 23) Me.label6.TabIndex = 6 Me.label6.Text = "Title" Me.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtMiddleName ' - Me.txtMiddleName.Location = New System.Drawing.Point(136, 88) + Me.txtMiddleName.Location = New System.Drawing.Point(181, 88) Me.txtMiddleName.Name = "txtMiddleName" - Me.txtMiddleName.Size = New System.Drawing.Size(208, 22) + Me.txtMiddleName.Size = New System.Drawing.Size(208, 26) Me.txtMiddleName.TabIndex = 5 ' 'label3 ' - Me.label3.Location = New System.Drawing.Point(21, 88) + Me.label3.Location = New System.Drawing.Point(61, 90) Me.label3.Name = "label3" - Me.label3.Size = New System.Drawing.Size(109, 23) + Me.label3.Size = New System.Drawing.Size(114, 23) Me.label3.TabIndex = 4 Me.label3.Text = "Middle Name" Me.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtFirstName ' - Me.txtFirstName.Location = New System.Drawing.Point(136, 56) + Me.txtFirstName.Location = New System.Drawing.Point(181, 56) Me.txtFirstName.Name = "txtFirstName" - Me.txtFirstName.Size = New System.Drawing.Size(208, 22) + Me.txtFirstName.Size = New System.Drawing.Size(208, 26) Me.txtFirstName.TabIndex = 3 ' 'label2 ' - Me.label2.Location = New System.Drawing.Point(50, 56) + Me.label2.Location = New System.Drawing.Point(61, 56) Me.label2.Name = "label2" - Me.label2.Size = New System.Drawing.Size(80, 23) + Me.label2.Size = New System.Drawing.Size(114, 23) Me.label2.TabIndex = 2 Me.label2.Text = "First Name" Me.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtLastName ' - Me.txtLastName.Location = New System.Drawing.Point(136, 24) + Me.txtLastName.Location = New System.Drawing.Point(181, 24) Me.txtLastName.Name = "txtLastName" - Me.txtLastName.Size = New System.Drawing.Size(208, 22) + Me.txtLastName.Size = New System.Drawing.Size(208, 26) Me.txtLastName.TabIndex = 1 ' 'label1 ' - Me.label1.Location = New System.Drawing.Point(50, 24) + Me.label1.Location = New System.Drawing.Point(61, 26) Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(80, 23) + Me.label1.Size = New System.Drawing.Size(114, 23) Me.label1.TabIndex = 0 Me.label1.Text = "&Last Name" Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -289,35 +289,35 @@ Partial Class VCardPropertiesDlg 'pgAddresses ' Me.pgAddresses.Controls.Add(Me.ucAddresses) - Me.pgAddresses.Location = New System.Drawing.Point(4, 25) + Me.pgAddresses.Location = New System.Drawing.Point(4, 29) Me.pgAddresses.Name = "pgAddresses" - Me.pgAddresses.Size = New System.Drawing.Size(674, 274) + Me.pgAddresses.Size = New System.Drawing.Size(713, 289) Me.pgAddresses.TabIndex = 1 Me.pgAddresses.Text = "Addresses" Me.pgAddresses.UseVisualStyleBackColor = true ' 'ucAddresses ' - Me.ucAddresses.Location = New System.Drawing.Point(5, 27) + Me.ucAddresses.Location = New System.Drawing.Point(9, 20) Me.ucAddresses.Name = "ucAddresses" - Me.ucAddresses.Size = New System.Drawing.Size(664, 220) + Me.ucAddresses.Size = New System.Drawing.Size(690, 248) Me.ucAddresses.TabIndex = 15 ' 'pgLabels ' Me.pgLabels.Controls.Add(Me.ucLabels) - Me.pgLabels.Location = New System.Drawing.Point(4, 25) + Me.pgLabels.Location = New System.Drawing.Point(4, 29) Me.pgLabels.Name = "pgLabels" - Me.pgLabels.Size = New System.Drawing.Size(674, 274) + Me.pgLabels.Size = New System.Drawing.Size(713, 289) Me.pgLabels.TabIndex = 7 Me.pgLabels.Text = "Labels" Me.pgLabels.UseVisualStyleBackColor = true ' 'ucLabels ' - Me.ucLabels.Location = New System.Drawing.Point(105, 37) + Me.ucLabels.Location = New System.Drawing.Point(18, 40) Me.ucLabels.Name = "ucLabels" - Me.ucLabels.Size = New System.Drawing.Size(464, 200) + Me.ucLabels.Size = New System.Drawing.Size(672, 208) Me.ucLabels.TabIndex = 0 ' 'pgPhoneEMail @@ -325,33 +325,33 @@ Partial Class VCardPropertiesDlg Me.pgPhoneEMail.Controls.Add(Me.groupBox2) Me.pgPhoneEMail.Controls.Add(Me.ucEMail) Me.pgPhoneEMail.Controls.Add(Me.ucPhones) - Me.pgPhoneEMail.Location = New System.Drawing.Point(4, 25) + Me.pgPhoneEMail.Location = New System.Drawing.Point(4, 29) Me.pgPhoneEMail.Name = "pgPhoneEMail" - Me.pgPhoneEMail.Size = New System.Drawing.Size(674, 274) + Me.pgPhoneEMail.Size = New System.Drawing.Size(713, 289) Me.pgPhoneEMail.TabIndex = 3 Me.pgPhoneEMail.Text = "Phone/E-Mail" Me.pgPhoneEMail.UseVisualStyleBackColor = true ' 'groupBox2 ' - Me.groupBox2.Location = New System.Drawing.Point(8, 144) + Me.groupBox2.Location = New System.Drawing.Point(9, 157) Me.groupBox2.Name = "groupBox2" - Me.groupBox2.Size = New System.Drawing.Size(664, 8) + Me.groupBox2.Size = New System.Drawing.Size(694, 8) Me.groupBox2.TabIndex = 2 Me.groupBox2.TabStop = false ' 'ucEMail ' - Me.ucEMail.Location = New System.Drawing.Point(96, 159) + Me.ucEMail.Location = New System.Drawing.Point(8, 173) Me.ucEMail.Name = "ucEMail" - Me.ucEMail.Size = New System.Drawing.Size(472, 104) + Me.ucEMail.Size = New System.Drawing.Size(689, 110) Me.ucEMail.TabIndex = 1 ' 'ucPhones ' - Me.ucPhones.Location = New System.Drawing.Point(96, 8) + Me.ucPhones.Location = New System.Drawing.Point(8, 8) Me.ucPhones.Name = "ucPhones" - Me.ucPhones.Size = New System.Drawing.Size(472, 128) + Me.ucPhones.Size = New System.Drawing.Size(689, 143) Me.ucPhones.TabIndex = 0 ' 'pgWork @@ -368,105 +368,105 @@ Partial Class VCardPropertiesDlg Me.pgWork.Controls.Add(Me.label19) Me.pgWork.Controls.Add(Me.txtOrganization) Me.pgWork.Controls.Add(Me.label18) - Me.pgWork.Location = New System.Drawing.Point(4, 25) + Me.pgWork.Location = New System.Drawing.Point(4, 29) Me.pgWork.Name = "pgWork" - Me.pgWork.Size = New System.Drawing.Size(674, 274) + Me.pgWork.Size = New System.Drawing.Size(713, 289) Me.pgWork.TabIndex = 2 Me.pgWork.Text = "Work" Me.pgWork.UseVisualStyleBackColor = true ' 'txtRole ' - Me.txtRole.Location = New System.Drawing.Point(144, 136) + Me.txtRole.Location = New System.Drawing.Point(170, 137) Me.txtRole.Name = "txtRole" - Me.txtRole.Size = New System.Drawing.Size(320, 22) + Me.txtRole.Size = New System.Drawing.Size(320, 26) Me.txtRole.TabIndex = 8 ' 'label22 ' - Me.label22.Location = New System.Drawing.Point(74, 136) + Me.label22.Location = New System.Drawing.Point(71, 139) Me.label22.Name = "label22" - Me.label22.Size = New System.Drawing.Size(64, 23) + Me.label22.Size = New System.Drawing.Size(93, 23) Me.label22.TabIndex = 7 Me.label22.Text = "Role" Me.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'groupBox7 ' - Me.groupBox7.Location = New System.Drawing.Point(16, 168) + Me.groupBox7.Location = New System.Drawing.Point(14, 168) Me.groupBox7.Name = "groupBox7" - Me.groupBox7.Size = New System.Drawing.Size(648, 8) + Me.groupBox7.Size = New System.Drawing.Size(684, 8) Me.groupBox7.TabIndex = 9 Me.groupBox7.TabStop = false ' 'txtCategories ' - Me.txtCategories.Location = New System.Drawing.Point(144, 192) + Me.txtCategories.Location = New System.Drawing.Point(170, 193) Me.txtCategories.Name = "txtCategories" - Me.txtCategories.Size = New System.Drawing.Size(440, 22) + Me.txtCategories.Size = New System.Drawing.Size(440, 26) Me.txtCategories.TabIndex = 11 ' 'label21 ' - Me.label21.Location = New System.Drawing.Point(58, 192) + Me.label21.Location = New System.Drawing.Point(42, 195) Me.label21.Name = "label21" - Me.label21.Size = New System.Drawing.Size(80, 23) + Me.label21.Size = New System.Drawing.Size(122, 23) Me.label21.TabIndex = 10 Me.label21.Text = "&Categories" Me.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtJobTitle ' - Me.txtJobTitle.Location = New System.Drawing.Point(144, 104) + Me.txtJobTitle.Location = New System.Drawing.Point(170, 105) Me.txtJobTitle.Name = "txtJobTitle" - Me.txtJobTitle.Size = New System.Drawing.Size(320, 22) + Me.txtJobTitle.Size = New System.Drawing.Size(320, 26) Me.txtJobTitle.TabIndex = 6 ' 'label20 ' - Me.label20.Location = New System.Drawing.Point(61, 104) + Me.label20.Location = New System.Drawing.Point(67, 107) Me.label20.Name = "label20" - Me.label20.Size = New System.Drawing.Size(77, 23) + Me.label20.Size = New System.Drawing.Size(97, 23) Me.label20.TabIndex = 5 Me.label20.Text = "&Job Title" Me.label20.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'groupBox6 ' - Me.groupBox6.Location = New System.Drawing.Point(16, 80) + Me.groupBox6.Location = New System.Drawing.Point(14, 80) Me.groupBox6.Name = "groupBox6" - Me.groupBox6.Size = New System.Drawing.Size(648, 8) + Me.groupBox6.Size = New System.Drawing.Size(684, 8) Me.groupBox6.TabIndex = 4 Me.groupBox6.TabStop = false ' 'txtUnits ' - Me.txtUnits.Location = New System.Drawing.Point(144, 48) + Me.txtUnits.Location = New System.Drawing.Point(170, 48) Me.txtUnits.Name = "txtUnits" - Me.txtUnits.Size = New System.Drawing.Size(440, 22) + Me.txtUnits.Size = New System.Drawing.Size(440, 26) Me.txtUnits.TabIndex = 3 ' 'label19 ' - Me.label19.Location = New System.Drawing.Point(90, 48) + Me.label19.Location = New System.Drawing.Point(88, 50) Me.label19.Name = "label19" - Me.label19.Size = New System.Drawing.Size(48, 23) + Me.label19.Size = New System.Drawing.Size(76, 23) Me.label19.TabIndex = 2 Me.label19.Text = "Units" Me.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtOrganization ' - Me.txtOrganization.Location = New System.Drawing.Point(144, 16) + Me.txtOrganization.Location = New System.Drawing.Point(170, 16) Me.txtOrganization.Name = "txtOrganization" - Me.txtOrganization.Size = New System.Drawing.Size(320, 22) + Me.txtOrganization.Size = New System.Drawing.Size(320, 26) Me.txtOrganization.TabIndex = 1 ' 'label18 ' - Me.label18.Location = New System.Drawing.Point(42, 16) + Me.label18.Location = New System.Drawing.Point(42, 18) Me.label18.Name = "label18" - Me.label18.Size = New System.Drawing.Size(96, 23) + Me.label18.Size = New System.Drawing.Size(122, 23) Me.label18.TabIndex = 0 Me.label18.Text = "&Organization" Me.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -490,93 +490,93 @@ Partial Class VCardPropertiesDlg Me.pgOther.Controls.Add(Me.label13) Me.pgOther.Controls.Add(Me.txtTimeZone) Me.pgOther.Controls.Add(Me.label12) - Me.pgOther.Location = New System.Drawing.Point(4, 25) + Me.pgOther.Location = New System.Drawing.Point(4, 29) Me.pgOther.Name = "pgOther" - Me.pgOther.Size = New System.Drawing.Size(674, 274) + Me.pgOther.Size = New System.Drawing.Size(713, 289) Me.pgOther.TabIndex = 4 Me.pgOther.Text = "Other" Me.pgOther.UseVisualStyleBackColor = true ' 'btnFind ' - Me.btnFind.Location = New System.Drawing.Point(448, 85) + Me.btnFind.Location = New System.Drawing.Point(542, 95) Me.btnFind.Name = "btnFind" - Me.btnFind.Size = New System.Drawing.Size(60, 28) + Me.btnFind.Size = New System.Drawing.Size(75, 28) Me.btnFind.TabIndex = 9 Me.btnFind.Text = "&Find" ' 'txtComments ' Me.txtComments.AcceptsReturn = true - Me.txtComments.Location = New System.Drawing.Point(128, 192) + Me.txtComments.Location = New System.Drawing.Point(150, 198) Me.txtComments.Multiline = true Me.txtComments.Name = "txtComments" Me.txtComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtComments.Size = New System.Drawing.Size(496, 72) + Me.txtComments.Size = New System.Drawing.Size(528, 72) Me.txtComments.TabIndex = 16 ' 'label17 ' - Me.label17.Location = New System.Drawing.Point(42, 192) + Me.label17.Location = New System.Drawing.Point(34, 200) Me.label17.Name = "label17" - Me.label17.Size = New System.Drawing.Size(80, 23) + Me.label17.Size = New System.Drawing.Size(110, 23) Me.label17.TabIndex = 15 Me.label17.Text = "&Comments" Me.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'groupBox5 ' - Me.groupBox5.Location = New System.Drawing.Point(16, 176) + Me.groupBox5.Location = New System.Drawing.Point(17, 182) Me.groupBox5.Name = "groupBox5" - Me.groupBox5.Size = New System.Drawing.Size(648, 8) + Me.groupBox5.Size = New System.Drawing.Size(688, 8) Me.groupBox5.TabIndex = 14 Me.groupBox5.TabStop = false ' 'btnWebPage ' - Me.btnWebPage.Location = New System.Drawing.Point(511, 141) + Me.btnWebPage.Location = New System.Drawing.Point(542, 149) Me.btnWebPage.Name = "btnWebPage" - Me.btnWebPage.Size = New System.Drawing.Size(60, 28) + Me.btnWebPage.Size = New System.Drawing.Size(75, 28) Me.btnWebPage.TabIndex = 13 Me.btnWebPage.Text = "&Go" ' 'txtWebPage ' - Me.txtWebPage.Location = New System.Drawing.Point(128, 144) + Me.txtWebPage.Location = New System.Drawing.Point(150, 150) Me.txtWebPage.Name = "txtWebPage" - Me.txtWebPage.Size = New System.Drawing.Size(368, 22) + Me.txtWebPage.Size = New System.Drawing.Size(368, 26) Me.txtWebPage.TabIndex = 12 ' 'label16 ' - Me.label16.Location = New System.Drawing.Point(42, 144) + Me.label16.Location = New System.Drawing.Point(34, 150) Me.label16.Name = "label16" - Me.label16.Size = New System.Drawing.Size(80, 23) + Me.label16.Size = New System.Drawing.Size(110, 23) Me.label16.TabIndex = 11 Me.label16.Text = "&Web Page" Me.label16.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'groupBox4 ' - Me.groupBox4.Location = New System.Drawing.Point(16, 120) + Me.groupBox4.Location = New System.Drawing.Point(17, 126) Me.groupBox4.Name = "groupBox4" - Me.groupBox4.Size = New System.Drawing.Size(648, 8) + Me.groupBox4.Size = New System.Drawing.Size(688, 8) Me.groupBox4.TabIndex = 10 Me.groupBox4.TabStop = false ' 'groupBox3 ' - Me.groupBox3.Location = New System.Drawing.Point(16, 40) + Me.groupBox3.Location = New System.Drawing.Point(17, 46) Me.groupBox3.Name = "groupBox3" - Me.groupBox3.Size = New System.Drawing.Size(648, 8) + Me.groupBox3.Size = New System.Drawing.Size(688, 8) Me.groupBox3.TabIndex = 2 Me.groupBox3.TabStop = false ' 'label15 ' - Me.label15.Location = New System.Drawing.Point(45, 8) + Me.label15.Location = New System.Drawing.Point(38, 14) Me.label15.Name = "label15" - Me.label15.Size = New System.Drawing.Size(77, 23) + Me.label15.Size = New System.Drawing.Size(106, 23) Me.label15.TabIndex = 0 Me.label15.Text = "&Birth Date" Me.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -586,56 +586,56 @@ Partial Class VCardPropertiesDlg Me.dtpBirthDate.Checked = false Me.dtpBirthDate.CustomFormat = "MM/dd/yyyy hh:mm:ss tt" Me.dtpBirthDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpBirthDate.Location = New System.Drawing.Point(128, 8) + Me.dtpBirthDate.Location = New System.Drawing.Point(150, 14) Me.dtpBirthDate.Name = "dtpBirthDate" Me.dtpBirthDate.ShowCheckBox = true - Me.dtpBirthDate.Size = New System.Drawing.Size(210, 22) + Me.dtpBirthDate.Size = New System.Drawing.Size(255, 26) Me.dtpBirthDate.TabIndex = 1 ' 'txtLongitude ' - Me.txtLongitude.Location = New System.Drawing.Point(328, 88) + Me.txtLongitude.Location = New System.Drawing.Point(398, 96) Me.txtLongitude.Name = "txtLongitude" - Me.txtLongitude.Size = New System.Drawing.Size(104, 22) + Me.txtLongitude.Size = New System.Drawing.Size(120, 26) Me.txtLongitude.TabIndex = 8 ' 'label14 ' - Me.label14.Location = New System.Drawing.Point(250, 88) + Me.label14.Location = New System.Drawing.Point(290, 98) Me.label14.Name = "label14" - Me.label14.Size = New System.Drawing.Size(72, 23) + Me.label14.Size = New System.Drawing.Size(102, 23) Me.label14.TabIndex = 7 Me.label14.Text = "Longitude" Me.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtLatitude ' - Me.txtLatitude.Location = New System.Drawing.Point(128, 88) + Me.txtLatitude.Location = New System.Drawing.Point(150, 96) Me.txtLatitude.Name = "txtLatitude" - Me.txtLatitude.Size = New System.Drawing.Size(104, 22) + Me.txtLatitude.Size = New System.Drawing.Size(120, 26) Me.txtLatitude.TabIndex = 6 ' 'label13 ' - Me.label13.Location = New System.Drawing.Point(58, 88) + Me.label13.Location = New System.Drawing.Point(51, 96) Me.label13.Name = "label13" - Me.label13.Size = New System.Drawing.Size(64, 23) + Me.label13.Size = New System.Drawing.Size(93, 23) Me.label13.TabIndex = 5 Me.label13.Text = "&Latitude" Me.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtTimeZone ' - Me.txtTimeZone.Location = New System.Drawing.Point(128, 56) + Me.txtTimeZone.Location = New System.Drawing.Point(150, 64) Me.txtTimeZone.Name = "txtTimeZone" - Me.txtTimeZone.Size = New System.Drawing.Size(304, 22) + Me.txtTimeZone.Size = New System.Drawing.Size(368, 26) Me.txtTimeZone.TabIndex = 4 ' 'label12 ' - Me.label12.Location = New System.Drawing.Point(42, 56) + Me.label12.Location = New System.Drawing.Point(34, 66) Me.label12.Name = "label12" - Me.label12.Size = New System.Drawing.Size(80, 23) + Me.label12.Size = New System.Drawing.Size(110, 23) Me.label12.TabIndex = 3 Me.label12.Text = "&Time Zone" Me.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -643,9 +643,9 @@ Partial Class VCardPropertiesDlg 'pgPhoto ' Me.pgPhoto.Controls.Add(Me.ucPhoto) - Me.pgPhoto.Location = New System.Drawing.Point(4, 25) + Me.pgPhoto.Location = New System.Drawing.Point(4, 29) Me.pgPhoto.Name = "pgPhoto" - Me.pgPhoto.Size = New System.Drawing.Size(674, 274) + Me.pgPhoto.Size = New System.Drawing.Size(713, 289) Me.pgPhoto.TabIndex = 5 Me.pgPhoto.Text = "Photo" Me.pgPhoto.UseVisualStyleBackColor = true @@ -653,7 +653,7 @@ Partial Class VCardPropertiesDlg 'ucPhoto ' Me.ucPhoto.Cursor = System.Windows.Forms.Cursors.Default - Me.ucPhoto.Location = New System.Drawing.Point(8, 33) + Me.ucPhoto.Location = New System.Drawing.Point(22, 40) Me.ucPhoto.Name = "ucPhoto" Me.ucPhoto.Size = New System.Drawing.Size(664, 208) Me.ucPhoto.TabIndex = 0 @@ -661,9 +661,9 @@ Partial Class VCardPropertiesDlg 'pgLogo ' Me.pgLogo.Controls.Add(Me.ucLogo) - Me.pgLogo.Location = New System.Drawing.Point(4, 25) + Me.pgLogo.Location = New System.Drawing.Point(4, 29) Me.pgLogo.Name = "pgLogo" - Me.pgLogo.Size = New System.Drawing.Size(674, 274) + Me.pgLogo.Size = New System.Drawing.Size(713, 289) Me.pgLogo.TabIndex = 6 Me.pgLogo.Text = "Logo" Me.pgLogo.UseVisualStyleBackColor = true @@ -671,7 +671,7 @@ Partial Class VCardPropertiesDlg 'ucLogo ' Me.ucLogo.Cursor = System.Windows.Forms.Cursors.Default - Me.ucLogo.Location = New System.Drawing.Point(8, 33) + Me.ucLogo.Location = New System.Drawing.Point(22, 40) Me.ucLogo.Name = "ucLogo" Me.ucLogo.Size = New System.Drawing.Size(664, 208) Me.ucLogo.TabIndex = 0 @@ -679,7 +679,7 @@ Partial Class VCardPropertiesDlg 'btnOK ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(12, 381) + Me.btnOK.Location = New System.Drawing.Point(12, 424) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(88, 32) Me.btnOK.TabIndex = 9 @@ -689,7 +689,7 @@ Partial Class VCardPropertiesDlg ' Me.btnCancel.CausesValidation = false Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(606, 381) + Me.btnCancel.Location = New System.Drawing.Point(645, 424) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(88, 32) Me.btnCancel.TabIndex = 10 @@ -697,18 +697,18 @@ Partial Class VCardPropertiesDlg ' 'txtUniqueId ' - Me.txtUniqueId.Location = New System.Drawing.Point(88, 12) + Me.txtUniqueId.Location = New System.Drawing.Point(115, 12) Me.txtUniqueId.Name = "txtUniqueId" Me.txtUniqueId.ReadOnly = true - Me.txtUniqueId.Size = New System.Drawing.Size(376, 22) + Me.txtUniqueId.Size = New System.Drawing.Size(376, 26) Me.txtUniqueId.TabIndex = 1 Me.txtUniqueId.TabStop = false ' 'label9 ' - Me.label9.Location = New System.Drawing.Point(10, 12) + Me.label9.Location = New System.Drawing.Point(12, 14) Me.label9.Name = "label9" - Me.label9.Size = New System.Drawing.Size(72, 23) + Me.label9.Size = New System.Drawing.Size(97, 23) Me.label9.TabIndex = 0 Me.label9.Text = "Unique ID" Me.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -716,53 +716,54 @@ Partial Class VCardPropertiesDlg 'txtClass ' Me.txtClass.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper - Me.txtClass.Location = New System.Drawing.Point(544, 42) + Me.txtClass.Location = New System.Drawing.Point(584, 46) Me.txtClass.Name = "txtClass" - Me.txtClass.Size = New System.Drawing.Size(144, 22) + Me.txtClass.Size = New System.Drawing.Size(145, 26) Me.txtClass.TabIndex = 7 ' 'label10 ' - Me.label10.Location = New System.Drawing.Point(490, 42) + Me.label10.Location = New System.Drawing.Point(500, 48) Me.label10.Name = "label10" - Me.label10.Size = New System.Drawing.Size(48, 23) + Me.label10.Size = New System.Drawing.Size(78, 23) Me.label10.TabIndex = 6 Me.label10.Text = "Class" Me.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'txtLastRevised ' - Me.txtLastRevised.Location = New System.Drawing.Point(88, 42) + Me.txtLastRevised.Location = New System.Drawing.Point(115, 46) Me.txtLastRevised.Name = "txtLastRevised" Me.txtLastRevised.ReadOnly = true - Me.txtLastRevised.Size = New System.Drawing.Size(168, 22) + Me.txtLastRevised.Size = New System.Drawing.Size(207, 26) Me.txtLastRevised.TabIndex = 5 Me.txtLastRevised.TabStop = false ' 'label11 ' - Me.label11.Location = New System.Drawing.Point(18, 42) + Me.label11.Location = New System.Drawing.Point(16, 48) Me.label11.Name = "label11" - Me.label11.Size = New System.Drawing.Size(64, 23) + Me.label11.Size = New System.Drawing.Size(93, 23) Me.label11.TabIndex = 4 Me.label11.Text = "Revised" Me.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'label23 ' - Me.label23.Location = New System.Drawing.Point(474, 12) + Me.label23.Location = New System.Drawing.Point(498, 14) Me.label23.Name = "label23" - Me.label23.Size = New System.Drawing.Size(64, 23) + Me.label23.Size = New System.Drawing.Size(80, 23) Me.label23.TabIndex = 2 Me.label23.Text = "&Version" Me.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'cboVersion ' + Me.cboVersion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboVersion.Items.AddRange(New Object() {"2.1", "3.0"}) - Me.cboVersion.Location = New System.Drawing.Point(544, 12) + Me.cboVersion.Location = New System.Drawing.Point(584, 12) Me.cboVersion.Name = "cboVersion" - Me.cboVersion.Size = New System.Drawing.Size(56, 24) + Me.cboVersion.Size = New System.Drawing.Size(65, 28) Me.cboVersion.TabIndex = 3 ' 'epErrors @@ -773,7 +774,7 @@ Partial Class VCardPropertiesDlg ' Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnCancel - Me.ClientSize = New System.Drawing.Size(706, 425) + Me.ClientSize = New System.Drawing.Size(745, 468) Me.Controls.Add(Me.cboVersion) Me.Controls.Add(Me.label23) Me.Controls.Add(Me.txtLastRevised) diff --git a/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.vb b/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.vb index 50cd4f9..acf6fdd 100644 --- a/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.vb +++ b/Source/VBNetDemos/vCardBrowser/VCardPropertiesDlg.vb @@ -20,7 +20,6 @@ ' 05/16/2007 EFW Updated for use with .NET 2.0 '================================================================================================================ -Imports System.ComponentModel Imports System.Globalization Imports EWSoftware.PDI @@ -122,7 +121,7 @@ Public Partial Class VCardPropertiesDlg If txtLatitude.Text.Length <> 0 Then If Not Double.TryParse(txtLatitude.Text, latitude) OrElse latitude < -90.0 OrElse latitude > 90.0 Then e.Cancel = True - epErrors.SetError(txtLatitude, "Latitude must be a valid numeric value between -90 and 90") + epErrors.SetError(txtLatitude, "Latitude must be a valid decimal value between -90 and 90") tabInfo.SelectedTab = pgOther txtLatitude.Focus() End If @@ -131,7 +130,7 @@ Public Partial Class VCardPropertiesDlg If txtLongitude.Text.Length <> 0 Then If Not Double.TryParse(txtLongitude.Text, longitude) OrElse longitude < -180.0 OrElse longitude > 180.0 Then e.Cancel = True - epErrors.SetError(txtLongitude, "Longitude must be a valid numeric value between -180 and 180") + epErrors.SetError(txtLongitude, "Longitude must be a valid decimal value between -180 and 180") tabInfo.SelectedTab = pgOther txtLongitude.Focus() End If