diff --git a/AppearanceCustomization_2010.csproj b/AppearanceCustomization_2010.csproj
index 857a2ac..41e8c40 100644
--- a/AppearanceCustomization_2010.csproj
+++ b/AppearanceCustomization_2010.csproj
@@ -64,8 +64,12 @@
MSBuild:Compile
Designer
-
+
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
@@ -106,12 +110,6 @@
-
-
-
-
-
-
diff --git a/Helper/ImageTemplateSelector.cs b/Helper/ImageTemplateSelector.cs
new file mode 100644
index 0000000..8f5bf4b
--- /dev/null
+++ b/Helper/ImageTemplateSelector.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+
+namespace AppearanceCustomization
+{
+ public class ImageTemplateSelector : IValueConverter
+ {
+ static ResourceDictionary myResourceDictionary;
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ static ImageTemplateSelector()
+ {
+ myResourceDictionary = new ResourceDictionary();
+ myResourceDictionary.Source =
+ new Uri("/AppointmentCustomization;component/Helper/SubjectImagePaths.xaml",
+ UriKind.RelativeOrAbsolute);
+ }
+
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ string imageName = value.ToString().Replace(" ", "").ToLower();
+ DataTemplate dataTemplateImagePaths;
+ dataTemplateImagePaths = myResourceDictionary[imageName] as DataTemplate;
+ if (dataTemplateImagePaths != null)
+ return dataTemplateImagePaths;
+ else
+ return myResourceDictionary["default"] as DataTemplate;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return null;
+ }
+ }
+}
diff --git a/Helper/SubjectImagePaths.xaml b/Helper/SubjectImagePaths.xaml
new file mode 100644
index 0000000..085aea6
--- /dev/null
+++ b/Helper/SubjectImagePaths.xaml
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Helper/SubjectToImageSourceConverter.cs b/Helper/SubjectToImageSourceConverter.cs
deleted file mode 100644
index 9a784c0..0000000
--- a/Helper/SubjectToImageSourceConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace AppearanceCustomization
-{
- public class SubjectToImageSourceConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- if (value.ToString().Equals("Conference"))
- return "../Images/Conference_schedule.png";
- else if (value.ToString().Equals("System Troubleshoot"))
- return "../Images/Troubleshoot.png";
- else if (value.ToString().Equals("Checkup"))
- return "../Images/Stethoscope.png";
- else
- return "../Images/cake_schedule.png";
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-}
diff --git a/Images/Conference_schedule.png b/Images/Conference_schedule.png
deleted file mode 100644
index a10b6f8..0000000
Binary files a/Images/Conference_schedule.png and /dev/null differ
diff --git a/Images/Stethoscope.png b/Images/Stethoscope.png
deleted file mode 100644
index b282b09..0000000
Binary files a/Images/Stethoscope.png and /dev/null differ
diff --git a/Images/Troubleshoot.png b/Images/Troubleshoot.png
deleted file mode 100644
index 1d01ab3..0000000
Binary files a/Images/Troubleshoot.png and /dev/null differ
diff --git a/Images/cake_schedule.png b/Images/cake_schedule.png
deleted file mode 100644
index 93596ad..0000000
Binary files a/Images/cake_schedule.png and /dev/null differ
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 6608cb5..eb88244 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -24,72 +24,73 @@
-
+
-
-
-
-
+
+
+ FontStyle="Italic"/>
-
-
-
-
+
+
-
+ TextWrapping="Wrap"
+ FontSize="12"
+ TextAlignment="Left"
+ FontStyle="Italic"/>
+
-
-
-
-
+
+
@@ -125,7 +126,7 @@
+ Margin="0,10,25,0">
diff --git a/ViewModel/SchedulerViewModel.cs b/ViewModel/SchedulerViewModel.cs
index da59fe4..d119eee 100644
--- a/ViewModel/SchedulerViewModel.cs
+++ b/ViewModel/SchedulerViewModel.cs
@@ -67,20 +67,20 @@ private void AddAppointments()
var day = random.Next(1, 30);
var hour = random.Next(9, 14);
var newEvent = new Events();
- newEvent.EventName = this.eventCollection[random.Next(0, 4)];
+ newEvent.EventName = this.eventCollection[random.Next(0, 9)];
newEvent.From = new DateTime(year, month, day, hour, 0, 0);
newEvent.To = newEvent.From.AddHours(1);
- newEvent.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(this.colorCollection[random.Next(0, 15)]));
+ newEvent.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(this.colorCollection[random.Next(0, 8)]));
this.Appointments.Add(newEvent);
}
for (int i = 0; i < 6; i++)
{
var allDayEvent = new Events();
- allDayEvent.EventName = this.eventCollection[random.Next(0, 5)];
+ allDayEvent.EventName = this.eventCollection[random.Next(0, 9)];
allDayEvent.From = this.startTimeCollection[random.Next(0,10)];
allDayEvent.To = allDayEvent.From.AddHours(1);
- allDayEvent.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(this.colorCollection[random.Next(0, 15)]));
+ allDayEvent.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(this.colorCollection[random.Next(0, 8)]));
allDayEvent.IsAllDay = true;
this.Appointments.Add(allDayEvent);
}
@@ -93,10 +93,15 @@ private void InitializingDataForEvents()
{
this.eventCollection = new List();
this.eventCollection.Add("Conference");
- this.eventCollection.Add("System Troubleshoot");
- this.eventCollection.Add("Birthday");
- this.eventCollection.Add("Checkup");
+ this.eventCollection.Add("Business Meeting");
this.eventCollection.Add("Conference");
+ this.eventCollection.Add("Medical check up");
+ this.eventCollection.Add("Consulting");
+ this.eventCollection.Add("Project Status Discussion");
+ this.eventCollection.Add("Client Meeting");
+ this.eventCollection.Add("General Meeting");
+ this.eventCollection.Add("Yoga Therapy");
+ this.eventCollection.Add("GoToMeeting");
this.startTimeCollection = new List();
this.startTimeCollection.Add(DateTime.Now.Date.AddHours(10));
@@ -126,15 +131,8 @@ private void InitializingDataForEvents()
this.colorCollection.Add("#FFF09609");
this.colorCollection.Add("#FF339933");
this.colorCollection.Add("#FF00ABA9");
- this.colorCollection.Add("#FFE671B8");
- this.colorCollection.Add("#FF1BA1E2");
- this.colorCollection.Add("#FFD80073");
- this.colorCollection.Add("#FFA2C139");
+ this.colorCollection.Add("#4F67FF");
this.colorCollection.Add("#FFA2C139");
- this.colorCollection.Add("#FFD80073");
- this.colorCollection.Add("#FF339933");
- this.colorCollection.Add("#FFE671B8");
- this.colorCollection.Add("#FF00ABA9");
}
#endregion
}