Merge proposition

TestHarness/Form1.cs

@@ -25,10 +25,20 @@ public partial class Form1 : Form
         public Form1()
         {
             InitializeComponent();
+            //public DateTime(int year, int month, int day, int hour, int minute, int second);
+            DateTime startT = new DateTime(2023, 03, 06, 15, 45, 00);
+            DateTime endT = new DateTime(2023, 03, 06, 16, 45, 00);
+            DateTime startT2 = new DateTime(2023, 03, 06, 15, 48, 00);
+            DateTime endT2 = new DateTime(2023, 03, 06, 16, 48, 00);
 
-            CalendarItem item = new CalendarItem( this.calendar1, DateTime.Now, DateTime.Now, "TEST" );
 
-            _items.Add( item );
+            CalendarItem itemToday = new CalendarItem(this.calendar1, DateTime.Now, DateTime.Now, "Today");
+            CalendarItem itemRuru = new CalendarItem(this.calendar1, startT, endT, "ruru1");
+            CalendarItem itemRuru2 = new CalendarItem(this.calendar1, startT2, endT2, "ruru2");
+
+            _items.Add(itemToday);
+            _items.Add(itemRuru);
+            _items.Add(itemRuru2);
 
         }
 
@@ -39,13 +49,13 @@ public Form1()
         /// </summary>
         /// <param name="sender">The source of the event.</param>
         /// <param name="e">The <see cref="WindowsFormsCalendar.CalendarLoadEventArgs"/> instance containing the event data.</param>
-        private void calendar1_LoadItems( object sender, CalendarLoadEventArgs e )
+        private void calendar1_LoadItems(object sender, CalendarLoadEventArgs e)
         {
-            foreach( CalendarItem calendarItem in _items )
+            foreach (CalendarItem calendarItem in _items)
             {
-                if( this.calendar1.ViewIntersects( calendarItem ) )
+                if (this.calendar1.ViewIntersects(calendarItem))
                 {
-                    this.calendar1.Items.Add( calendarItem );
+                    this.calendar1.Items.Add(calendarItem);
                 }
             }
         }
@@ -59,11 +69,17 @@ private void calendar1_LoadItems( object sender, CalendarLoadEventArgs e )
         /// </summary>
         /// <param name="sender">The source of the event.</param>
         /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        private void monthView1_SelectionChanged( object sender, EventArgs e )
+        private void monthView1_SelectionChanged(object sender, EventArgs e)
         {
-            this.calendar1.SetViewRange( this.monthView1.SelectionStart.Date, this.monthView1.SelectionEnd.Date);
+            this.calendar1.SetViewRange(this.monthView1.SelectionStart.Date, this.monthView1.SelectionEnd.Date);
+        }
+
+        private void calendar1_ItemCreated(object sender, CalendarItemCancelEventArgs e)
+        {
+            _items.Add(e.Item);
+            CalendarItemCancelEventArgs eTemp = e;
+            int i = 0;
         }
-
         #endregion
 
     }

TestHarness/obj/x86/Debug/.NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0,Profile=Client", FrameworkDisplayName = ".NET Framework 4 Client Profile")]

TestHarness/obj/x86/Debug/TestHarness.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+4431b82abdfc0a656c0732273c1aa7f42109928b

TestHarness/obj/x86/Debug/TestHarness.csproj.FileListAbsolute.txt

@@ -0,0 +1,12 @@
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\bin\Debug\TestHarness.exe
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\bin\Debug\TestHarness.pdb
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\bin\Debug\WindowsFormsCalendar.dll
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\bin\Debug\WindowsFormsCalendar.pdb
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.csproj.AssemblyReference.cache
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.Form1.resources
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.Properties.Resources.resources
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.csproj.GenerateResource.cache
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.csproj.CoreCompileInputs.cache
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.csproj.CopyComplete
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.exe
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\TestHarness\obj\x86\Debug\TestHarness.pdb

WindowsFormsCalendar/CalendarDay.cs

@@ -285,12 +285,13 @@ internal void UpdateUnits()
 
             switch (Calendar.TimeScale)
             {
-                case CalendarTimeScale.SixtyMinutes:    factor = 1;     break;
-                case CalendarTimeScale.ThirtyMinutes:   factor = 2;     break;
-                case CalendarTimeScale.FifteenMinutes:  factor = 4;     break;
-                case CalendarTimeScale.TenMinutes:      factor = 6;     break;
-                case CalendarTimeScale.SixMinutes:      factor = 10;    break;
-                case CalendarTimeScale.FiveMinutes:     factor = 12;    break;
+                case CalendarTimeScale.SixtyMinutes:
+                case CalendarTimeScale.ThirtyMinutes:
+                case CalendarTimeScale.FifteenMinutes:
+                case CalendarTimeScale.TenMinutes:
+                case CalendarTimeScale.SixMinutes:
+                case CalendarTimeScale.FiveMinutes:
+                case CalendarTimeScale.OneMinute: factor = 60 / ((int)Calendar.TimeScale); break;
                 default: throw new NotImplementedException("TimeScale not supported");
             }
 

WindowsFormsCalendar/Enums/CalendarTimeScale.cs

@@ -56,6 +56,11 @@ public enum CalendarTimeScale
         /// <summary>
         /// Makes calendar show intervals of 5 minutes
         /// </summary>
-        FiveMinutes = 5
+        FiveMinutes = 5,
+
+        /// <summary>
+        /// Makes calendar show intervals of 1 minute
+        /// </summary>
+        OneMinute = 1
     }
 }

WindowsFormsCalendar/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

WindowsFormsCalendar/obj/Debug/WindowsFormsCalendar.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+407e7daf9f4efedc31189a70715351027edff97a

WindowsFormsCalendar/obj/Debug/WindowsFormsCalendar.csproj.FileListAbsolute.txt

@@ -0,0 +1,6 @@
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\WindowsFormsCalendar\bin\Debug\WindowsFormsCalendar.dll
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\WindowsFormsCalendar\bin\Debug\WindowsFormsCalendar.pdb
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\WindowsFormsCalendar\obj\Debug\WindowsFormsCalendar.csproj.AssemblyReference.cache
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\WindowsFormsCalendar\obj\Debug\WindowsFormsCalendar.csproj.CoreCompileInputs.cache
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\WindowsFormsCalendar\obj\Debug\WindowsFormsCalendar.dll
+D:\Projects.C#\sampleCalendarMyFork\Winforms-Calendar\WindowsFormsCalendar\obj\Debug\WindowsFormsCalendar.pdb