From eb94732eafd6f3cce7d7cc6c514fcc6e2b238b2f Mon Sep 17 00:00:00 2001 From: gdkhd812 Date: Sat, 12 Oct 2013 14:52:01 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB?= =?utf8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88?= =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Metro/FooEditEngine/FooEditEngine.csproj | 3 +++ Metro/FooEditEngine/Print/DocumentSource.cs | 2 +- Metro/Test.sln | 24 ++++++++++++------------ Metro/Test/Test.csproj | 6 ------ Windows/FooEditEngine/FooEditEngine.csproj | 3 +++ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Metro/FooEditEngine/FooEditEngine.csproj b/Metro/FooEditEngine/FooEditEngine.csproj index 6ccd8e1..ee2c01a 100644 --- a/Metro/FooEditEngine/FooEditEngine.csproj +++ b/Metro/FooEditEngine/FooEditEngine.csproj @@ -216,6 +216,9 @@ ViewBase.cs + + WatchDogPattern.cs + diff --git a/Metro/FooEditEngine/Print/DocumentSource.cs b/Metro/FooEditEngine/Print/DocumentSource.cs index 8a8fc8e..a63655b 100644 --- a/Metro/FooEditEngine/Print/DocumentSource.cs +++ b/Metro/FooEditEngine/Print/DocumentSource.cs @@ -57,7 +57,7 @@ namespace FooEditEngine sealed class PrintableViewFactory { - Color foreground, comment, keyword1, keyword2, literal, url; + Windows.UI.Color foreground, comment, keyword1, keyword2, literal, url; string fontName; double fontSize; Document document; diff --git a/Metro/Test.sln b/Metro/Test.sln index bed20fc..2dc891b 100644 --- a/Metro/Test.sln +++ b/Metro/Test.sln @@ -3,10 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{D5A54EBE-15AC-48E9-819B-99314266B683}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FooEditEngine", "FooEditEngnine\FooEditEngine.csproj", "{AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetTextStore.Metro", "..\Common\DotNetTextStore\DotNetTextStore.Metro.csproj", "{453C491E-EF3A-41AD-A725-8855C1CB2C84}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FooEditEngine", "FooEditEngine\FooEditEngine.csproj", "{AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,6 +43,16 @@ Global {D5A54EBE-15AC-48E9-819B-99314266B683}.Release|x86.ActiveCfg = Release|x86 {D5A54EBE-15AC-48E9-819B-99314266B683}.Release|x86.Build.0 = Release|x86 {D5A54EBE-15AC-48E9-819B-99314266B683}.Release|x86.Deploy.0 = Release|x86 + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|ARM.ActiveCfg = Debug|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|x64.ActiveCfg = Debug|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|x86.ActiveCfg = Debug|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|Any CPU.Build.0 = Release|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|ARM.ActiveCfg = Release|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|x64.ActiveCfg = Release|Any CPU + {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|x86.ActiveCfg = Release|Any CPU {AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}.Debug|ARM.ActiveCfg = Debug|ARM @@ -59,16 +69,6 @@ Global {AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}.Release|x64.Build.0 = Release|x64 {AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}.Release|x86.ActiveCfg = Release|x86 {AC23EBF4-4CD0-43EA-9808-0E6DCD12E791}.Release|x86.Build.0 = Release|x86 - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|ARM.ActiveCfg = Debug|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|x64.ActiveCfg = Debug|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Debug|x86.ActiveCfg = Debug|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|Any CPU.Build.0 = Release|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|ARM.ActiveCfg = Release|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|x64.ActiveCfg = Release|Any CPU - {453C491E-EF3A-41AD-A725-8855C1CB2C84}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Metro/Test/Test.csproj b/Metro/Test/Test.csproj index 87e22b5..5d061a3 100644 --- a/Metro/Test/Test.csproj +++ b/Metro/Test/Test.csproj @@ -148,12 +148,6 @@ MSBuild:Compile - - - {ac23ebf4-4cd0-43ea-9808-0e6dcd12e791} - FooEditEngine - - 11.0 diff --git a/Windows/FooEditEngine/FooEditEngine.csproj b/Windows/FooEditEngine/FooEditEngine.csproj index dca7313..bd39102 100644 --- a/Windows/FooEditEngine/FooEditEngine.csproj +++ b/Windows/FooEditEngine/FooEditEngine.csproj @@ -151,6 +151,9 @@ ViewBase.cs + + WatchDogPattern.cs + -- 2.11.0