diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj b/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj
index 41de4fa935..3b15162bd5 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj
@@ -79,6 +79,7 @@
+
@@ -111,10 +112,12 @@
+
+
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
index 19fdafd518..5dcc9f4923 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
@@ -1,4 +1,4 @@
-
+ Width="500">
@@ -23,137 +23,211 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
index 2536996d5b..7f4115ce81 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
@@ -19,6 +19,9 @@ namespace ICSharpCode.AspNet.Mvc
MvcViewEngineViewModel selectedViewEngine;
bool isStronglyTypedView;
bool isContentPage;
+ bool isSelectMasterPageViewOpen;
+ MvcMasterPageFileName selectedMasterPage;
+ string masterPageFile = String.Empty;
MvcModelClassViewModelsForSelectedFolder modelClassesForSelectedFolder;
@@ -38,6 +41,7 @@ namespace ICSharpCode.AspNet.Mvc
this.viewFileName.Folder = selectedViewFolder.Path;
this.ModelClassName = String.Empty;
this.PrimaryContentPlaceHolderId = "Main";
+ this.MasterPages = new ObservableCollection();
CreateModelClassesForSelectedFolder();
CreateCommands();
@@ -53,9 +57,15 @@ namespace ICSharpCode.AspNet.Mvc
void CreateCommands()
{
AddMvcViewCommand = new DelegateCommand(param => AddMvcView(), param => CanAddMvcView());
+ OpenSelectMasterPageViewCommand = new DelegateCommand(param => OpenSelectMasterPageView());
+ CloseSelectMasterPageViewCommand = new DelegateCommand(param => CloseSelectMasterPageView());
+ SelectMasterPageCommand = new DelegateCommand(param => SelectMasterPage(), param => CanSelectMasterPage());
}
public ICommand AddMvcViewCommand { get; private set; }
+ public ICommand OpenSelectMasterPageViewCommand { get; private set; }
+ public ICommand CloseSelectMasterPageViewCommand { get; private set; }
+ public ICommand SelectMasterPageCommand { get; private set; }
public string ViewName {
get { return viewFileName.ViewName; }
@@ -236,8 +246,67 @@ namespace ICSharpCode.AspNet.Mvc
public MvcModelClassViewModel SelectedModelClass { get; set; }
public string ModelClassName { get; set; }
- public string MasterPageFile { get; set; }
public string PrimaryContentPlaceHolderId { get; set; }
+
+ public string MasterPageFile {
+ get { return masterPageFile; }
+ set {
+ masterPageFile = value;
+ OnPropertyChanged(viewModel => viewModel.MasterPageFile);
+ }
+ }
+
+ public bool IsSelectMasterPageViewOpen {
+ get { return isSelectMasterPageViewOpen; }
+ set {
+ isSelectMasterPageViewOpen = value;
+ OnPropertyChanged(viewModel => viewModel.IsSelectMasterPageViewOpen);
+ }
+ }
+
+ public void OpenSelectMasterPageView()
+ {
+ UpdateMasterPages();
+ IsSelectMasterPageViewOpen = true;
+ }
+
+ void UpdateMasterPages()
+ {
+ MasterPages.Clear();
+ foreach (MvcMasterPageFileName fileName in GetAspxMasterPageFileNames()) {
+ MasterPages.Add(fileName);
+ }
+ }
+
+ IEnumerable GetAspxMasterPageFileNames()
+ {
+ return selectedViewFolder.Project.GetAspxMasterPageFileNames();
+ }
+
+ public void CloseSelectMasterPageView()
+ {
+ IsSelectMasterPageViewOpen = false;
+ }
+
+ public ObservableCollection MasterPages { get; private set; }
+
+ public MvcMasterPageFileName SelectedMasterPage {
+ get { return selectedMasterPage; }
+ set { selectedMasterPage = value; }
+ }
+
+ public void SelectMasterPage()
+ {
+ if (selectedMasterPage != null) {
+ MasterPageFile = selectedMasterPage.VirtualPath;
+ }
+ IsSelectMasterPageViewOpen = false;
+ }
+
+ public bool CanSelectMasterPage()
+ {
+ return selectedMasterPage != null;
+ }
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/BooleanToVisibilityConverter.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/BooleanToVisibilityConverter.cs
index db36345283..840e10eee3 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/BooleanToVisibilityConverter.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/BooleanToVisibilityConverter.cs
@@ -11,10 +11,12 @@ namespace ICSharpCode.AspNet.Mvc
public class BooleanToVisibilityConverter : IValueConverter
{
public bool Hidden { get; set; }
+ public bool IsReversed { get; set; }
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
- if ((bool)value) {
+ bool visible = IsVisible((bool)value);
+ if (visible) {
return Visibility.Visible;
} else if (Hidden) {
return Visibility.Hidden;
@@ -22,10 +24,23 @@ namespace ICSharpCode.AspNet.Mvc
return Visibility.Collapsed;
}
+ bool IsVisible(bool value)
+ {
+ if (IsReversed) {
+ return !value;
+ }
+ return value;
+ }
+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
- Visibility visibility = (Visibility)value;
- return visibility == Visibility.Visible;
+ return IsVisible((Visibility)value);
+ }
+
+ bool IsVisible(Visibility visibility)
+ {
+ bool visible = visibility == Visibility.Visible;
+ return IsVisible(visible);
}
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcProject.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcProject.cs
index 46a0da7359..0e7252b5ba 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcProject.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/IMvcProject.cs
@@ -16,5 +16,7 @@ namespace ICSharpCode.AspNet.Mvc
void Save();
MvcTextTemplateLanguage GetTemplateLanguage();
IEnumerable GetModelClasses();
+
+ IEnumerable GetAspxMasterPageFileNames();
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcMasterPageFileName.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcMasterPageFileName.cs
new file mode 100644
index 0000000000..2562d997b5
--- /dev/null
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcMasterPageFileName.cs
@@ -0,0 +1,85 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.IO;
+using ICSharpCode.SharpDevelop.Project;
+
+namespace ICSharpCode.AspNet.Mvc
+{
+ public class MvcMasterPageFileName
+ {
+ public MvcMasterPageFileName(FileProjectItem fileProjectItem)
+ {
+ UpdateFileName(fileProjectItem);
+ }
+
+ void UpdateFileName(FileProjectItem fileProjectItem)
+ {
+ FullPath = fileProjectItem.FileName;
+ FileName = Path.GetFileName(FullPath);
+ FolderRelativeToProject = GetFolderRelativeToProject(fileProjectItem);
+ VirtualPath = GetVirtualPath();
+ }
+
+ string GetFolderRelativeToProject(FileProjectItem fileProjectItem)
+ {
+ return Path.GetDirectoryName(fileProjectItem.Include);
+ }
+
+ string GetVirtualPath()
+ {
+ var virtualPath = new MvcVirtualPath(FolderRelativeToProject, FileName);
+ return virtualPath.VirtualPath;
+ }
+
+ public MvcMasterPageFileName()
+ {
+ FullPath = String.Empty;
+ FileName = String.Empty;
+ FolderRelativeToProject = String.Empty;
+ VirtualPath = String.Empty;
+ }
+
+ public string FullPath { get; set; }
+ public string FileName { get; set; }
+ public string FolderRelativeToProject { get; set; }
+ public string VirtualPath { get; set; }
+
+ public override string ToString()
+ {
+ return FullPath;
+ }
+
+ public static MvcMasterPageFileName CreateMvcMasterPageFileName(ProjectItem projectItem)
+ {
+ var fileProjectItem = projectItem as FileProjectItem;
+ if (fileProjectItem != null) {
+ return CreateMvcMasterPageFileName(fileProjectItem);
+ }
+ return null;
+ }
+
+ public static MvcMasterPageFileName CreateMvcMasterPageFileName(FileProjectItem fileProjectItem)
+ {
+ if (IsMasterPageFileName(fileProjectItem.FileName)) {
+ return new MvcMasterPageFileName(fileProjectItem);
+ }
+ return null;
+ }
+
+ public static bool IsMasterPageFileName(string fileName)
+ {
+ string extension = GetLowerCaseFileExtension(fileName);
+ return extension == ".master";
+ }
+
+ static string GetLowerCaseFileExtension(string fileName)
+ {
+ if (fileName != null) {
+ return Path.GetExtension(fileName).ToLowerInvariant();
+ }
+ return String.Empty;
+ }
+ }
+}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcProject.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcProject.cs
index 6d93ba12cf..ff18c84bc4 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcProject.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcProject.cs
@@ -43,5 +43,15 @@ namespace ICSharpCode.AspNet.Mvc
{
return modelClassLocator.GetModelClasses(this);
}
+
+ public IEnumerable GetAspxMasterPageFileNames()
+ {
+ foreach (ProjectItem projectItem in Project.Items) {
+ MvcMasterPageFileName fileName = MvcMasterPageFileName.CreateMvcMasterPageFileName(projectItem);
+ if (fileName != null) {
+ yield return fileName;
+ }
+ }
+ }
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcVirtualPath.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcVirtualPath.cs
new file mode 100644
index 0000000000..a2598832ff
--- /dev/null
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcVirtualPath.cs
@@ -0,0 +1,39 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+
+namespace ICSharpCode.AspNet.Mvc
+{
+ public class MvcVirtualPath
+ {
+ public MvcVirtualPath(string folderRelativeToProject, string fileName)
+ {
+ VirtualPath = GetVirtualPath(folderRelativeToProject, fileName);
+ }
+
+ public string VirtualPath { get; private set; }
+
+ string GetVirtualPath(string folderRelativeToProject, string fileName)
+ {
+ return String.Format(
+ "~/{0}{1}",
+ GetFolderRelativeToProjectAsVirtualPath(folderRelativeToProject),
+ fileName);
+ }
+
+ string GetFolderRelativeToProjectAsVirtualPath(string folderRelativeToProject)
+ {
+ string virtualFolder = folderRelativeToProject.Replace('\\', '/');
+ return AppendForwardSlashIfVirtualFolderIsNotEmptyString(virtualFolder);
+ }
+
+ string AppendForwardSlashIfVirtualFolderIsNotEmptyString(string virtualFolder)
+ {
+ if (String.IsNullOrEmpty(virtualFolder)) {
+ return String.Empty;
+ }
+ return virtualFolder + "/";
+ }
+ }
+}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/SlideBehaviour.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/SlideBehaviour.cs
new file mode 100644
index 0000000000..f971e8e484
--- /dev/null
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/SlideBehaviour.cs
@@ -0,0 +1,126 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Windows;
+using System.Windows.Media.Animation;
+
+namespace ICSharpCode.AspNet.Mvc
+{
+ public static class SlideBehaviour
+ {
+ public static readonly DependencyProperty FrameworkElementHiddenBySlideProperty =
+ DependencyProperty.RegisterAttached(
+ "FrameworkElementHiddenBySlide",
+ typeof(FrameworkElement),
+ typeof(SlideBehaviour),
+ new UIPropertyMetadata(null));
+
+ public static FrameworkElement GetFrameworkElementHiddenBySlide(FrameworkElement frameworkElement)
+ {
+ return frameworkElement.GetValue(FrameworkElementHiddenBySlideProperty) as FrameworkElement;
+ }
+
+ public static void SetFrameworkElementHiddenBySlide(FrameworkElement frameworkElement, FrameworkElement hiddenFrameworkElement)
+ {
+ frameworkElement.SetValue(FrameworkElementHiddenBySlideProperty, hiddenFrameworkElement);
+ }
+
+ public static readonly DependencyProperty IsDisplayedProperty =
+ DependencyProperty.RegisterAttached(
+ "IsDisplayed",
+ typeof(bool),
+ typeof(SlideBehaviour),
+ new UIPropertyMetadata(false, OnIsDisplayedChanged));
+
+ public static bool GetIsDisplayed(FrameworkElement frameworkElement)
+ {
+ return (bool)frameworkElement.GetValue(IsDisplayedProperty);
+ }
+
+ public static void SetIsDisplayed(FrameworkElement frameworkElement, bool value)
+ {
+ frameworkElement.SetValue(IsDisplayedProperty, value);
+ }
+
+ static void OnIsDisplayedChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+ {
+ var frameworkElement = dependencyObject as FrameworkElement;
+ if (frameworkElement == null) {
+ return;
+ }
+
+ if (e.NewValue is bool) {
+ if ((bool)e.NewValue) {
+ SlideIn(frameworkElement);
+ } else {
+ SlideOut(frameworkElement);
+ }
+ }
+ }
+
+ static void SlideIn(FrameworkElement frameworkElement)
+ {
+ AnimationTimeline marginAnimation = CreateSlideInAnimation(frameworkElement);
+ frameworkElement.BeginAnimation(FrameworkElement.MarginProperty, marginAnimation);
+ frameworkElement.Visibility = Visibility.Visible;
+ DisableHiddenFrameworkElement(frameworkElement);
+ }
+
+ static AnimationTimeline CreateSlideInAnimation(FrameworkElement frameworkElement)
+ {
+ var parent = frameworkElement.Parent as FrameworkElement;
+
+ var marginAnimation = new ThicknessAnimation();
+ marginAnimation.From = new Thickness(parent.ActualWidth, 0, 0, 0);
+ marginAnimation.To = new Thickness(0);
+ marginAnimation.Duration = duration;
+ return marginAnimation;
+ }
+
+ static readonly Duration duration = new Duration(new TimeSpan(TimeSpan.TicksPerMillisecond * 100));
+
+ static void DisableHiddenFrameworkElement(FrameworkElement frameworkElement)
+ {
+ EnableHiddenFrameworkElement(frameworkElement, enabled: false);
+ }
+
+ static void EnableHiddenFrameworkElement(FrameworkElement frameworkElement, bool enabled)
+ {
+ FrameworkElement hiddenFrameworkElement = GetFrameworkElementHiddenBySlide(frameworkElement);
+ if (hiddenFrameworkElement != null) {
+ hiddenFrameworkElement.IsEnabled = enabled;
+ }
+ }
+
+ static void SlideOut(FrameworkElement frameworkElement)
+ {
+ AnimationTimeline marginAnimation = CreateSlideOutAnimation(frameworkElement);
+ frameworkElement.BeginAnimation(FrameworkElement.MarginProperty, marginAnimation);
+ }
+
+ static AnimationTimeline CreateSlideOutAnimation(FrameworkElement frameworkElement)
+ {
+ var parent = frameworkElement.Parent as FrameworkElement;
+
+ var marginAnimation = new ThicknessAnimation();
+ marginAnimation.From = new Thickness(0);
+ marginAnimation.To = new Thickness(parent.ActualWidth, 0, 0, 0);
+ marginAnimation.Duration = duration;
+ marginAnimation.Completed += (sender, e) => OnSlideOutCompleted(frameworkElement);
+
+ return marginAnimation;
+ }
+
+ static void OnSlideOutCompleted(FrameworkElement frameworkElement)
+ {
+ frameworkElement.Visibility = Visibility.Collapsed;
+ EnableHiddenFrameworkElement(frameworkElement);
+ }
+
+ static void EnableHiddenFrameworkElement(FrameworkElement frameworkElement)
+ {
+ EnableHiddenFrameworkElement(frameworkElement, true);
+ }
+ }
+}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/AspNet.Mvc.Tests.csproj b/src/AddIns/BackendBindings/AspNet.Mvc/Test/AspNet.Mvc.Tests.csproj
index 345b522af4..b477da6006 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/AspNet.Mvc.Tests.csproj
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/AspNet.Mvc.Tests.csproj
@@ -66,6 +66,8 @@
+
+
@@ -79,6 +81,7 @@
+
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcProject.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcProject.cs
index 17557ccb63..23c65e645d 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcProject.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/FakeMvcProject.cs
@@ -63,5 +63,17 @@ namespace AspNet.Mvc.Tests.Helpers
GetModelClassesCallCount++;
return ModelClasses;
}
+
+ public List MasterPageFileNames = new List();
+
+ public void AddMasterPageFile(MvcMasterPageFileName fileName)
+ {
+ MasterPageFileNames.Add(fileName);
+ }
+
+ public IEnumerable GetAspxMasterPageFileNames()
+ {
+ return MasterPageFileNames;
+ }
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/MvcMasterPageFileNameAssert.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/MvcMasterPageFileNameAssert.cs
new file mode 100644
index 0000000000..0eb5c31cd1
--- /dev/null
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/MvcMasterPageFileNameAssert.cs
@@ -0,0 +1,28 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using ICSharpCode.AspNet.Mvc;
+using NUnit.Framework;
+
+namespace AspNet.Mvc.Tests.Helpers
+{
+ public static class MvcMasterPageFileNameAssert
+ {
+ public static void AreEqual(MvcMasterPageFileName expected, MvcMasterPageFileName actual)
+ {
+ string expectedAsString = GetMvcMasterPageFileNameAsString(expected);
+ string actualAsString = GetMvcMasterPageFileNameAsString(actual);
+ Assert.AreEqual(expectedAsString, actualAsString);
+ }
+
+ public static string GetMvcMasterPageFileNameAsString(MvcMasterPageFileName fileName)
+ {
+ return String.Format(
+ "FileName: {0}\r\nFolder: {1}\r\n, FullPath: {2}",
+ fileName.FileName,
+ fileName.FolderRelativeToProject,
+ fileName.FullPath);
+ }
+ }
+}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/MvcMasterPageFileNameCollectionAssert.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/MvcMasterPageFileNameCollectionAssert.cs
new file mode 100644
index 0000000000..5e298829af
--- /dev/null
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/MvcMasterPageFileNameCollectionAssert.cs
@@ -0,0 +1,32 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.AspNet.Mvc;
+using ICSharpCode.SharpDevelop;
+using NUnit.Framework;
+
+namespace AspNet.Mvc.Tests.Helpers
+{
+ public static class MvcMasterPageFileNameCollectionAssert
+ {
+ public static void AreEqual(IEnumerable expected, IEnumerable actual)
+ {
+ List expectedAsStrings = GetMvcMasterPageFileNamesAsStrings(expected);
+ List actualAsStrings = GetMvcMasterPageFileNamesAsStrings(actual);
+
+ CollectionAssert.AreEqual(expectedAsStrings, actualAsStrings);
+ }
+
+ static List GetMvcMasterPageFileNamesAsStrings(IEnumerable fileNames)
+ {
+ var convertedFileNames = new List();
+ foreach (MvcMasterPageFileName fileName in fileNames) {
+ string fileNameAsString = MvcMasterPageFileNameAssert.GetMvcMasterPageFileNameAsString(fileName);
+ convertedFileNames.Add(fileNameAsString);
+ }
+ return convertedFileNames;
+ }
+ }
+}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs
index 214063e078..7bab0f089b 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs
@@ -55,5 +55,13 @@ namespace AspNet.Mvc.Tests.Helpers
public override bool ReadOnly {
get { return false; }
}
+
+ public FileProjectItem AddFileToProject(string fileName)
+ {
+ var projectItem = new FileProjectItem(this, ItemType.Compile);
+ projectItem.FileName = fileName;
+ ProjectService.AddProjectItem(this, projectItem);
+ return projectItem;
+ }
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
index 839d527896..8846cbdda1 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
@@ -207,7 +207,7 @@ namespace AspNet.Mvc.Tests
}
[Test]
- public void AddMvcViewCommand_ViewNameIsNotEmptyString_CommandIsEnable()
+ public void AddMvcViewCommand_ViewNameIsNotEmptyString_CommandIsEnabled()
{
CreateViewModel();
viewModel.ViewName = "MyView";
@@ -730,5 +730,187 @@ namespace AspNet.Mvc.Tests
Assert.AreEqual(String.Empty, id);
}
+
+ [Test]
+ public void OpenSelectMasterPageViewCommand_Executed_SelectMasterPageViewModelIsOpened()
+ {
+ CreateViewModel();
+ viewModel.OpenSelectMasterPageViewCommand.Execute(null);
+
+ bool open = viewModel.IsSelectMasterPageViewOpen;
+
+ Assert.IsTrue(open);
+ }
+
+ [Test]
+ public void OpenSelectMasterPageViewCommand_Executed_IsSelectMasterPageViewOpenPropertyChanged()
+ {
+ CreateViewModel();
+ MonitorPropertyChangedEvents();
+ viewModel.OpenSelectMasterPageViewCommand.Execute(null);
+
+ bool contains = propertyChangedEvents.Contains("IsSelectMasterPageViewOpen");
+
+ Assert.IsTrue(contains);
+ }
+
+ [Test]
+ public void IsSelectMasterPageViewOpen_NotExecuted_SelectMasterPageViewModelIsNotOpened()
+ {
+ CreateViewModel();
+
+ bool open = viewModel.IsSelectMasterPageViewOpen;
+
+ Assert.IsFalse(open);
+ }
+
+ [Test]
+ public void CloseSelectMasterPageViewCommand_Executed_SelectMasterPageViewModelIsClosed()
+ {
+ CreateViewModel();
+ viewModel.OpenSelectMasterPageView();
+ viewModel.CloseSelectMasterPageViewCommand.Execute(null);
+
+ bool open = viewModel.IsSelectMasterPageViewOpen;
+
+ Assert.IsFalse(open);
+ }
+
+ [Test]
+ public void CloseSelectMasterPageViewCommand_Executed_IsSelectMasterPageViewOpenPropertyChanged()
+ {
+ CreateViewModel();
+ MonitorPropertyChangedEvents();
+ viewModel.CloseSelectMasterPageViewCommand.Execute(null);
+
+ bool contains = propertyChangedEvents.Contains("IsSelectMasterPageViewOpen");
+
+ Assert.IsTrue(contains);
+ }
+
+ [Test]
+ public void MasterPages_ProjectContainsOneAspxMasterPage_ReturnsOneAspxMasterPage()
+ {
+ CreateViewModel();
+ SelectAspxViewEngine();
+ var masterPageFile = new MvcMasterPageFileName() {
+ FullPath = @"d:\projects\MyProject\Views\Shared\Site.Master",
+ FileName = "Site.Master",
+ FolderRelativeToProject = @"Views\Shared"
+ };
+ fakeProject.AddMasterPageFile(masterPageFile);
+ viewModel.OpenSelectMasterPageView();
+
+ var expectedFileNames = new MvcMasterPageFileName[] {
+ masterPageFile
+ };
+
+ ObservableCollection fileNames = viewModel.MasterPages;
+
+ Assert.AreEqual(expectedFileNames, fileNames);
+ }
+
+ [Test]
+ public void MasterPages_CloseAndReOpenSelectMasterPageViewWhenProjectContainsOneAspxMasterPage_ReturnsOneAspxMasterPage()
+ {
+ CreateViewModel();
+ SelectAspxViewEngine();
+ var masterPageFile = new MvcMasterPageFileName();
+ fakeProject.AddMasterPageFile(masterPageFile);
+ viewModel.OpenSelectMasterPageView();
+ viewModel.CloseSelectMasterPageView();
+ viewModel.OpenSelectMasterPageView();
+
+ var expectedFileNames = new MvcMasterPageFileName[] {
+ masterPageFile
+ };
+
+ ObservableCollection fileNames = viewModel.MasterPages;
+
+ Assert.AreEqual(expectedFileNames, fileNames);
+ }
+
+ [Test]
+ public void SelectMasterPageCommand_MasterPageNotSelected_CommandIsDisabled()
+ {
+ CreateViewModel();
+ viewModel.SelectedMasterPage = null;
+
+ bool canExecute = viewModel.SelectMasterPageCommand.CanExecute(null);
+
+ Assert.IsFalse(canExecute);
+ }
+
+ [Test]
+ public void SelectMasterPageCommand_MasterPageIsSelected_CommandIsEnabled()
+ {
+ CreateViewModel();
+ viewModel.SelectedMasterPage = new MvcMasterPageFileName();
+
+ bool canExecute = viewModel.SelectMasterPageCommand.CanExecute(null);
+
+ Assert.IsTrue(canExecute);
+ }
+
+ [Test]
+ public void SelectMasterPageCommand_Executed_SelectMasterPageViewModelIsClosed()
+ {
+ CreateViewModel();
+ viewModel.OpenSelectMasterPageView();
+ viewModel.SelectMasterPageCommand.Execute(null);
+
+ bool open = viewModel.IsSelectMasterPageViewOpen;
+
+ Assert.IsFalse(open);
+ }
+
+ [Test]
+ public void SelectMasterPageCommand_Executed_IsSelectMasterPageViewOpenPropertyChanged()
+ {
+ CreateViewModel();
+ viewModel.OpenSelectMasterPageView();
+ MonitorPropertyChangedEvents();
+ viewModel.SelectMasterPageCommand.Execute(null);
+
+ bool contains = propertyChangedEvents.Contains("IsSelectMasterPageViewOpen");
+
+ Assert.IsTrue(contains);
+ }
+
+ [Test]
+ public void SelectMasterPage_MasterPageSelected_MasterPageFileNameUpdated()
+ {
+ CreateViewModel();
+ viewModel.MasterPageFile = "test.master";
+ viewModel.OpenSelectMasterPageView();
+ var masterPageFileName = new MvcMasterPageFileName() {
+ FullPath = @"d:\projects\MyProject\Views\Shared\site.master",
+ FileName = "site.master",
+ FolderRelativeToProject = @"Views\Shared",
+ VirtualPath = "~/Views/Shared/site.master"
+ };
+ viewModel.SelectedMasterPage = masterPageFileName;
+ viewModel.SelectMasterPage();
+
+ string updatedMasterPageFile = viewModel.MasterPageFile;
+
+ Assert.AreEqual("~/Views/Shared/site.master", updatedMasterPageFile);
+ }
+
+ [Test]
+ public void SelectMasterPage_MasterPageSelected_MasterPageFilePropertyChangedEventFired()
+ {
+ CreateViewModel();
+ viewModel.OpenSelectMasterPageView();
+ var masterPageFileName = new MvcMasterPageFileName();
+ viewModel.SelectedMasterPage = masterPageFileName;
+
+ MonitorPropertyChangedEvents();
+ viewModel.SelectMasterPage();
+
+ bool fired = propertyChangedEvents.Contains("MasterPageFile");
+
+ Assert.IsTrue(fired);
+ }
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/BooleanToVisibilityConverterTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/BooleanToVisibilityConverterTests.cs
index e62bf64b13..05c1cb12ef 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/BooleanToVisibilityConverterTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/BooleanToVisibilityConverterTests.cs
@@ -84,5 +84,45 @@ namespace AspNet.Mvc.Tests
Assert.IsFalse(value);
}
+
+ [Test]
+ public void Convert_FalseWithIsReversedSetToTrue_ReturnsVisible()
+ {
+ CreateConverter();
+ converter.IsReversed = true;
+ Visibility visibility = Convert(false);
+
+ Assert.AreEqual(Visibility.Visible, visibility);
+ }
+
+ [Test]
+ public void Convert_TrueWithIsReversedSetToTrue_ReturnsCollapsed()
+ {
+ CreateConverter();
+ converter.IsReversed = true;
+ Visibility visibility = Convert(true);
+
+ Assert.AreEqual(Visibility.Collapsed, visibility);
+ }
+
+ [Test]
+ public void ConvertBack_VisibleWithIsReversedSetToTrue_ReturnsFalse()
+ {
+ CreateConverter();
+ converter.IsReversed = true;
+ bool value = ConvertBack(Visibility.Visible);
+
+ Assert.IsFalse(value);
+ }
+
+ [Test]
+ public void ConvertBack_CollapsedWithIsReversedSetToTrue_ReturnsTrue()
+ {
+ CreateConverter();
+ converter.IsReversed = true;
+ bool value = ConvertBack(Visibility.Collapsed);
+
+ Assert.IsTrue(value);
+ }
}
}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcMasterPageFileNameTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcMasterPageFileNameTests.cs
new file mode 100644
index 0000000000..c91f028015
--- /dev/null
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcMasterPageFileNameTests.cs
@@ -0,0 +1,86 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using AspNet.Mvc.Tests.Helpers;
+using ICSharpCode.AspNet.Mvc;
+using ICSharpCode.SharpDevelop.Project;
+using NUnit.Framework;
+
+namespace AspNet.Mvc.Tests
+{
+ [TestFixture]
+ public class MvcMasterPageFileNameTests
+ {
+ TestableProject project;
+ MvcMasterPageFileName masterPageFileName;
+
+ void CreateProject(string fileName)
+ {
+ project = TestableProject.CreateProject(fileName, "MyProject");
+ }
+
+ void CreateMasterPageFileName(string fullPath)
+ {
+ var projectItem = new FileProjectItem(project, ItemType.Compile);
+ projectItem.FileName = fullPath;
+ masterPageFileName = new MvcMasterPageFileName(projectItem);
+ }
+
+ [Test]
+ public void FullPath_CreatedFromFileProjectItem_ReturnsFullFileNameIncludingFolder()
+ {
+ CreateProject(@"d:\projects\MyProject\MyProject.csproj");
+ string expectedFullPath = @"d:\projects\MyProject\Views\Shared\Site.Master";
+ CreateMasterPageFileName(expectedFullPath);
+
+ string fullPath = masterPageFileName.FullPath;
+
+ Assert.AreEqual(expectedFullPath, fullPath);
+ }
+
+ [Test]
+ public void FileName_CreatedFromFileProjectItem_ReturnsFileNameWithoutFolder()
+ {
+ CreateProject(@"d:\projects\MyProject\MyProject.csproj");
+ CreateMasterPageFileName(@"d:\projects\MyProject\Views\Shared\Site.Master");
+
+ string fileName = masterPageFileName.FileName;
+
+ Assert.AreEqual("Site.Master", fileName);
+ }
+
+ [Test]
+ public void FolderRelativeToProject_CreatedFromFileProjectItem_ReturnsFileNameWithoutFolder()
+ {
+ CreateProject(@"d:\projects\MyProject\MyProject.csproj");
+ CreateMasterPageFileName(@"d:\projects\MyProject\Views\Shared\Site.Master");
+
+ string folder = masterPageFileName.FolderRelativeToProject;
+
+ Assert.AreEqual(@"Views\Shared", folder);
+ }
+
+ [Test]
+ public void VirtualPath_CreatedFromFileProjectItem_ReturnsAspNetVirtualPathForFileName()
+ {
+ CreateProject(@"d:\projects\MyProject\MyProject.csproj");
+ CreateMasterPageFileName(@"d:\projects\MyProject\Views\Shared\Site.Master");
+
+ string virtualPath = masterPageFileName.VirtualPath;
+
+ Assert.AreEqual("~/Views/Shared/Site.Master", virtualPath);
+ }
+
+ [Test]
+ public void VirtualPath_FileInProjectRootDirectory_ReturnsAspNetVirtualPathForFileName()
+ {
+ CreateProject(@"d:\projects\MyProject\MyProject.csproj");
+ CreateMasterPageFileName(@"d:\projects\MyProject\Site.Master");
+
+ string virtualPath = masterPageFileName.VirtualPath;
+
+ Assert.AreEqual("~/Site.Master", virtualPath);
+ }
+ }
+}
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcProjectTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcProjectTests.cs
index b65d78137c..09851e9c3a 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcProjectTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcProjectTests.cs
@@ -2,6 +2,7 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
+using System.Collections.Generic;
using System.Linq;
using AspNet.Mvc.Tests.Helpers;
using ICSharpCode.AspNet.Mvc;
@@ -19,11 +20,28 @@ namespace AspNet.Mvc.Tests
void CreateProject()
{
- testableProject = TestableProject.CreateProject();
+ CreateProject(@"d:\projects\MyProject\MyProject.csproj");
+ }
+
+ void CreateProject(string fileName)
+ {
+ testableProject = TestableProject.CreateProject(fileName, "MyProject");
fakeModelClassLocator = new FakeMvcModelClassLocator();
project = new MvcProject(testableProject, fakeModelClassLocator);
}
+ void AddFileToProject(string fileName)
+ {
+ testableProject.AddFileToProject(fileName);
+ }
+
+ List GetAspxMasterPageFileNames()
+ {
+ return new List(
+ project.GetAspxMasterPageFileNames()
+ );
+ }
+
[Test]
public void Project_ProjectPassedToConstructor_ReturnsProjectPassedToConstructor()
{
@@ -105,5 +123,76 @@ namespace AspNet.Mvc.Tests
Assert.AreEqual(project, fakeModelClassLocator.ProjectPassedToGetModelClasses);
}
+
+ [Test]
+ public void GetAspxMasterPageFileNames_OneMasterPageInProject_ReturnsOneFileName()
+ {
+ CreateProject(@"d:\projects\AspNetMvcProject\MyProject.csproj");
+ AddFileToProject(@"d:\projects\AspNetMvcProject\Views\Shared\Site.Master");
+ List fileNames = GetAspxMasterPageFileNames();
+
+ Assert.AreEqual(1, fileNames.Count);
+ }
+
+ [Test]
+ public void GetAspxMasterPageFileNames_OneMasterPageInProject_ReturnsOneMasterPageWithExpectedFileName()
+ {
+ CreateProject(@"d:\projects\AspNetMvcProject\MyProject.csproj");
+ AddFileToProject(@"d:\projects\AspNetMvcProject\Views\Shared\Site.Master");
+ MvcMasterPageFileName fileName = GetAspxMasterPageFileNames().First();
+
+ var expectedFileName = new MvcMasterPageFileName() {
+ FullPath = @"d:\projects\AspNetMvcProject\Views\Shared\Site.Master",
+ FileName = "Site.Master",
+ FolderRelativeToProject = @"Views\Shared"
+ };
+
+ MvcMasterPageFileNameAssert.AreEqual(expectedFileName, fileName);
+ }
+
+ [Test]
+ public void GetAspxMasterPageFileNames_OneHtmlFileAndOneMasterPageInProject_ReturnsOneMasterPageWithExpectedFileName()
+ {
+ CreateProject(@"d:\projects\AspNetMvcProject\MyProject.csproj");
+ AddFileToProject(@"d:\projects\AspNetMvcProject\Views\Shared\test.html");
+ AddFileToProject(@"d:\projects\AspNetMvcProject\Views\Shared\Site.Master");
+ List fileNames = GetAspxMasterPageFileNames();
+
+ var expectedFileName = new MvcMasterPageFileName() {
+ FullPath = @"d:\projects\AspNetMvcProject\Views\Shared\Site.Master",
+ FileName = "Site.Master",
+ FolderRelativeToProject = @"Views\Shared"
+ };
+
+ var expectedFileNames = new MvcMasterPageFileName[] {
+ expectedFileName
+ };
+
+ MvcMasterPageFileNameCollectionAssert.AreEqual(expectedFileNames, fileNames);
+ }
+
+ [Test]
+ public void GetAspxMasterPageFileNames_OneMasterPageWithFileExtensionInUpperCaseInProject_ReturnsOneMasterPageWithExpectedFileName()
+ {
+ CreateProject(@"d:\projects\AspNetMvcProject\MyProject.csproj");
+ AddFileToProject(@"d:\projects\AspNetMvcProject\Views\Shared\TEST.MASTER");
+ MvcMasterPageFileName fileName = GetAspxMasterPageFileNames().First();
+
+ var expectedFileName = new MvcMasterPageFileName() {
+ FullPath = @"d:\projects\AspNetMvcProject\Views\Shared\TEST.MASTER",
+ FileName = "TEST.MASTER",
+ FolderRelativeToProject = @"Views\Shared"
+ };
+
+ MvcMasterPageFileNameAssert.AreEqual(expectedFileName, fileName);
+ }
+
+ [Test]
+ public void IsMvcMasterPage_NullFileNamePassed_ReturnsFalse()
+ {
+ bool result = MvcMasterPageFileName.IsMasterPageFileName(null);
+
+ Assert.IsFalse(result);
+ }
}
}