Commit: 50f8ed7dd581d224c4b21e23eeca1856b76aa93e - xamlin (git)

XAMLで書けるインストーラを作るプロジェクト

Commit MetaInfo

• Revision: 50f8ed7dd581d224c4b21e23eeca1856b76aa93e (tree)
• Time: 2011-06-03 18:22:10
• Author: azyobuzin <azyobuzin@user...>
• Commiter: azyobuzin

Log Message

MVVM的に分けた

Change Summary

• modified: XamlIn.Installer/App.xaml
• delete: XamlIn.Installer/Installer.cs
• add: XamlIn.Installer/Models/MainModel.cs
• add: XamlIn.Installer/NotifyObject.cs
• modified: XamlIn.Installer/Properties/AssemblyInfo.cs
• add: XamlIn.Installer/ViewModels/MainWindowViewModel.cs
• modified: XamlIn.Installer/XamlIn.Installer.csproj
• delete: XamlIn.Installer/{ => Models}/File.cs
• delete: XamlIn.Installer/{ => Models}/FileCollection.cs
• delete: XamlIn.Installer/{ => Models}/XamlIn.cs
• delete: XamlIn.Installer/{ => Views}/MainWindow.xaml
• delete: XamlIn.Installer/{ => Views}/MainWindow.xaml.cs

Incremental Difference

--- a/XamlIn.Installer/App.xaml
+++ b/XamlIn.Installer/App.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="Azyobuzi.XamlIn.Installer.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Views\MainWindow.xaml">
     <Application.Resources>
          
     </Application.Resources>

--- a/XamlIn.Installer/Installer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-using System.Linq.Expressions;
-
-namespace Azyobuzi.XamlIn.Installer
-{
-    /// <summary>
-    /// インストーラの状況など。ViewModel（＆Model）的な役割。
-    /// </summary>
-    public class Installer : INotifyPropertyChanged
-    {
-        #region PropertyChanged
-        /// <summary>
-        /// プロパティ値が変更されたときに発生します。
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        private void RaisePropertyChanged<T>(Expression<Func<T>> property)
-        {
-            if (this.PropertyChanged != null)
-                this.PropertyChanged(this, new PropertyChangedEventArgs(
-                    ((MemberExpression)property.Body).Member.Name));
-        }
-        #endregion
-    }
-}

--- a/XamlIn.Installer/File.cs
+++ b/XamlIn.Installer/Models/File.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Windows;
 
-namespace Azyobuzi.XamlIn.Installer
+namespace Azyobuzi.XamlIn.Installer.Models
 {
     /// <summary>
     /// インストーラのリソースとして持つファイルソース

--- a/XamlIn.Installer/FileCollection.cs
+++ b/XamlIn.Installer/Models/FileCollection.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-namespace Azyobuzi.XamlIn.Installer
+namespace Azyobuzi.XamlIn.Installer.Models
 {
     /// <summary>
     /// <see cref="File"/>のコレクション

--- /dev/null
+++ b/XamlIn.Installer/Models/MainModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using System.Linq.Expressions;
+
+namespace Azyobuzi.XamlIn.Installer.Models
+{
+    /// <summary>
+    /// インストーラの状況など
+    /// </summary>
+    public class MainModel : NotifyObject
+    {
+
+    }
+}

--- a/XamlIn.Installer/XamlIn.cs
+++ b/XamlIn.Installer/Models/XamlIn.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Azyobuzi.XamlIn.Installer
+namespace Azyobuzi.XamlIn.Installer.Models
 {
     /// <summary>
     /// インストーラの設定

--- /dev/null
+++ b/XamlIn.Installer/NotifyObject.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using System.Linq.Expressions;
+
+namespace Azyobuzi.XamlIn.Installer
+{
+    public abstract class NotifyObject : INotifyPropertyChanged
+    {
+        /// <summary>
+        /// プロパティ値が変更されたときに発生します。
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// PropertyChangedを発生させます。
+        /// </summary>
+        /// <param name="propertyName">プロパティ名</param>
+        protected virtual void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        /// <summary>
+        /// PropertyChangedを発生させます。
+        /// </summary>
+        /// <typeparam name="T">プロパティの型</typeparam>
+        /// <param name="property">通知するプロパティを<c>() => PropertyName</c>の様に指定します。</param>
+        protected virtual void RaisePropertyChanged<T>(Expression<Func<T>> property)
+        {
+            this.RaisePropertyChanged(((MemberExpression)property.Body).Member.Name);
+        }
+    }
+}

--- a/XamlIn.Installer/Properties/AssemblyInfo.cs
+++ b/XamlIn.Installer/Properties/AssemblyInfo.cs
@@ -53,4 +53,4 @@ using System.Windows.Markup;
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
-[assembly: XmlnsDefinition("http://azyobuzinet.ohitashi.com/schemas/xamlin.html", "Azyobuzi.XamlIn.Installer")]
\ No newline at end of file
+[assembly: XmlnsDefinition("http://azyobuzinet.ohitashi.com/schemas/xamlin.html", "Azyobuzi.XamlIn.Installer.Models")]
\ No newline at end of file

--- /dev/null
+++ b/XamlIn.Installer/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Azyobuzi.XamlIn.Installer.ViewModels
+{
+    /// <summary>
+    /// <see cref="MainWindow"/>のViewModel。のはずなのにコントロールもってたりする。
+    /// <see cref="Models.MainModel"/>をラップします。
+    /// </summary>
+    public class MainWindowViewModel : NotifyObject
+    {
+    }
+}

--- a/XamlIn.Installer/MainWindow.xaml
+++ b/XamlIn.Installer/Views/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="Azyobuzi.XamlIn.Installer.MainWindow"
+<Window x:Class="Azyobuzi.XamlIn.Installer.Views.MainWindow"
         Name="mainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

--- a/XamlIn.Installer/MainWindow.xaml.cs
+++ b/XamlIn.Installer/Views/MainWindow.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Azyobuzi.XamlIn.Installer
+namespace Azyobuzi.XamlIn.Installer.Views
 {
     /// <summary>
     /// インストーラウィザードを表示するウィンドウ

--- a/XamlIn.Installer/XamlIn.Installer.csproj
+++ b/XamlIn.Installer/XamlIn.Installer.csproj
@@ -63,10 +63,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="File.cs" />
-    <Compile Include="FileCollection.cs" />
-    <Compile Include="XamlIn.cs" />
-    <Page Include="MainWindow.xaml">
+    <Compile Include="Models\File.cs" />
+    <Compile Include="Models\FileCollection.cs" />
+    <Compile Include="Models\XamlIn.cs" />
+    <Page Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -74,8 +74,10 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Installer.cs" />
-    <Compile Include="MainWindow.xaml.cs">
+    <Compile Include="Models\MainModel.cs" />
+    <Compile Include="NotifyObject.cs" />
+    <Compile Include="ViewModels\MainWindowViewModel.cs" />
+    <Compile Include="Views\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>