OSDN Git Service

v2.6.1.5-alpha
authorwagashi <wagashi@users.sourceforge.jp>
Fri, 28 Jan 2011 17:36:15 +0000 (02:36 +0900)
committerwagashi <wagashi@users.sourceforge.jp>
Fri, 28 Jan 2011 17:36:15 +0000 (02:36 +0900)
29 files changed:
macro.bing/BingTranslationMacro.cs [deleted file]
macro.bing/macro.bing.csproj
macro.google/PopupTranslateMacro.cs [deleted file]
macro.google/macro.google.csproj
macro.popup/PopupYomiganaMacro.cs [deleted file]
macro.popup/macro.popup.csproj
macro.text/TexToUpperMacro.cs [deleted file]
macro.text/TextDateTimeMacro.cs [deleted file]
macro.text/TextSurroundMacro.cs [deleted file]
macro.text/TextToHankakuMacro.cs [deleted file]
macro.text/TextToLowerMacro.cs [deleted file]
macro.text/TextToSpaceMacro.cs [deleted file]
macro.text/TextToTabMacro.cs [deleted file]
macro.text/TextToZenkakuMacro.cs [deleted file]
macro.text/macro.text.csproj
macro/Macro.cs [moved from passer/Macro.cs with 100% similarity]
macro/Properties/AssemblyInfo.cs [new file with mode: 0644]
macro/app.config [new file with mode: 0644]
macro/macro.csproj [new file with mode: 0644]
macro/macro.sln [new file with mode: 0644]
macro/macro.suo [new file with mode: 0644]
passer/Passer.csproj
passer/Passer.sln
passer/Passer.suo
passer/Program.cs
passer/Properties/AssemblyInfo.cs
passer/bin/Release/macro/Lugens.Passer.Macro.Google.dll [deleted file]
passer/bin/Release/macro/Lugens.Passer.Macro.Popup.dll [deleted file]
passer/bin/Release/macro/Lugens.Passer.Macro.Text.dll [deleted file]

diff --git a/macro.bing/BingTranslationMacro.cs b/macro.bing/BingTranslationMacro.cs
deleted file mode 100644 (file)
index beaf24a..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-using System.Globalization;
-using Lugens.Passer.Macro.Bing.net.bing.api;
-
-namespace Lugens.Passer.Macro.Bing
-{
-    public class TranslationMacro : IMacro
-    {
-        const string AppId = "A01584CB8A078CEF40EF61C013A6EC87F144870E";
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-         
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Bing.PopupTranslation";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.InOutPopup;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "PopupBingTranslation";
-        }
-
-        public string Summary()
-        {
-            return "翻訳します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:0~1個").Append(Environment.NewLine)
-                .ToString();
-        }
-
-        public string Execute(string str, string[] args)
-        {
-            return null;
-        }
-
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            using (BingService service = new BingService())
-            {
-                try
-                {
-                    SearchRequest request = BuildRequest(str);
-
-                    // Send the request; display the response.
-                    service.SearchCompleted += OnSearchCompleted;
-                    service.SearchAsync(request);
-                    //SearchResponse response = service.Search(request);
-                    //s = DisplayResponse(response);
-                }
-                catch (System.Web.Services.Protocols.SoapException)
-                {
-                    // A SOAP Exception was thrown. Display error details.
-                }
-                catch (System.Net.WebException)
-                {
-                    // An exception occurred while accessing the network.
-                }
-            }
-        }
-
-        static SearchRequest BuildRequest(string str)
-        {
-            SearchRequest request = new SearchRequest();
-
-            // Common request fields (required)
-            request.AppId = AppId;
-            request.Query = str;
-            request.Sources = new SourceType[] { SourceType.Translation };
-
-            // SourceType-specific fields (required)
-            request.Translation = new TranslationRequest();
-            request.Translation.SourceLanguage = "en";
-            request.Translation.TargetLanguage = "ja";
-
-            // Common request fields (optional)
-            request.Version = "2.2";
-
-            return request;
-        }
-
-        static string DisplayResponse(SearchResponse response)
-        {
-            StringBuilder sb = new StringBuilder();
-            // Display the results header.
-            Console.WriteLine("Bing API Version " + response.Version);
-            Console.WriteLine("Translation results for " + response.Query.SearchTerms);
-            Console.WriteLine();
-
-            // Display the Translation results.
-            foreach (TranslationResult result in response.Translation.Results)
-            {
-                sb.Append(result.TranslatedTerm);
-            }
-            return sb.ToString();
-        }
-
-        public bool Test()
-        {
-            using (BingService service = new BingService())
-            {
-                try
-                {
-                    SearchRequest request = new SearchRequest();
-                    request.AppId = AppId;
-                    request.Query = "test";
-                    request.Sources = new SourceType[] { SourceType.Translation };
-                    request.Translation = new TranslationRequest();
-                    request.Translation.SourceLanguage = "en";
-                    request.Translation.TargetLanguage = "ja";
-                    request.Version = "2.2";
-                    service.Search(request);
-                }
-                catch (System.Web.Services.Protocols.SoapException)
-                {
-                    return false;
-                }
-                catch (System.Net.WebException)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public void OnSearchCompleted(object sender, SearchCompletedEventArgs e)
-        {
-            string s = DisplayResponse(e.Result);
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(s);
-
-        }
-
-    }
-
-}
index f82ea8b..cc80f28 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1E59DD0D-5EC3-4335-855F-3A34C0D4BC09}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Lugens.Passer.Macro.Bing</RootNamespace>
-    <AssemblyName>Lugens.Passer.Macro.Bing</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BingTranslationMacro.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Web References\net.bing.api\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\net.bing.api\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\net.bing.api\search.wsdl" />
-    <None Include="Web References\net.bing.api\SearchResponse.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferences Include="Web References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferenceUrl Include="http://api.bing.net/search.wsdl%3fVersion=2.2">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\net.bing.api\</RelPath>
-      <UpdateFromURL>http://api.bing.net/search.wsdl%3fVersion=2.2</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>Lugens_Passer_Macro_Bing_net_bing_api_BingService</CachedSettingsPropName>
-    </WebReferenceUrl>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\passer\Passer.csproj">
-      <Project>{A51E566C-9BBE-4579-986B-31CD2E71FAE8}</Project>
-      <Name>Passer</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 および x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows インストーラー 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{1E59DD0D-5EC3-4335-855F-3A34C0D4BC09}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>Lugens.Passer.Macro.Bing</RootNamespace>\r
+    <AssemblyName>Lugens.Passer.Macro.Bing</AssemblyName>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+    <FileUpgradeFlags>\r
+    </FileUpgradeFlags>\r
+    <OldToolsVersion>3.5</OldToolsVersion>\r
+    <UpgradeBackupLocation />\r
+    <TargetFrameworkProfile />\r
+    <PublishUrl>publish\</PublishUrl>\r
+    <Install>true</Install>\r
+    <InstallFrom>Disk</InstallFrom>\r
+    <UpdateEnabled>false</UpdateEnabled>\r
+    <UpdateMode>Foreground</UpdateMode>\r
+    <UpdateInterval>7</UpdateInterval>\r
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
+    <UpdatePeriodically>false</UpdatePeriodically>\r
+    <UpdateRequired>false</UpdateRequired>\r
+    <MapFileExtensions>true</MapFileExtensions>\r
+    <ApplicationRevision>0</ApplicationRevision>\r
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
+    <IsWebBootstrapper>false</IsWebBootstrapper>\r
+    <UseApplicationTrust>false</UseApplicationTrust>\r
+    <BootstrapperEnabled>true</BootstrapperEnabled>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.EnterpriseServices" />\r
+    <Reference Include="System.Web.Services" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <Compile Include="Properties\Settings.Designer.cs">\r
+      <AutoGen>True</AutoGen>\r
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>\r
+      <DependentUpon>Settings.settings</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Web References\net.bing.api\Reference.cs">\r
+      <AutoGen>True</AutoGen>\r
+      <DesignTime>True</DesignTime>\r
+      <DependentUpon>Reference.map</DependentUpon>\r
+    </Compile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="app.config" />\r
+    <None Include="Properties\Settings.settings">\r
+      <Generator>SettingsSingleFileGenerator</Generator>\r
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>\r
+    </None>\r
+    <None Include="Web References\net.bing.api\Reference.map">\r
+      <Generator>MSDiscoCodeGenerator</Generator>\r
+      <LastGenOutput>Reference.cs</LastGenOutput>\r
+    </None>\r
+    <None Include="Web References\net.bing.api\search.wsdl" />\r
+    <None Include="Web References\net.bing.api\SearchResponse.datasource">\r
+      <DependentUpon>Reference.map</DependentUpon>\r
+    </None>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <WebReferences Include="Web References\" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <WebReferenceUrl Include="http://api.bing.net/search.wsdl%3fVersion=2.2">\r
+      <UrlBehavior>Dynamic</UrlBehavior>\r
+      <RelPath>Web References\net.bing.api\</RelPath>\r
+      <UpdateFromURL>http://api.bing.net/search.wsdl%3fVersion=2.2</UpdateFromURL>\r
+      <ServiceLocationURL>\r
+      </ServiceLocationURL>\r
+      <CachedDynamicPropName>\r
+      </CachedDynamicPropName>\r
+      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>\r
+      <CachedSettingsPropName>Lugens_Passer_Macro_Bing_net_bing_api_BingService</CachedSettingsPropName>\r
+    </WebReferenceUrl>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\passer\Passer.csproj">\r
+      <Project>{A51E566C-9BBE-4579-986B-31CD2E71FAE8}</Project>\r
+      <Name>Passer</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">\r
+      <Visible>False</Visible>\r
+      <ProductName>Microsoft .NET Framework 4 %28x86 および x64%29</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
+      <Visible>False</Visible>\r
+      <ProductName>Windows インストーラー 3.1</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->\r
 </Project>
\ No newline at end of file
diff --git a/macro.google/PopupTranslateMacro.cs b/macro.google/PopupTranslateMacro.cs
deleted file mode 100644 (file)
index 715fe9c..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Globalization;
-using System.Net;
-using System.IO;
-using System.Web;\r
-using System.Windows.Forms;\r
-using System.Diagnostics;\r
-using System.Threading;
-
-namespace Lugens.Passer.Macro.Google
-{
-    public class PopupTranslateMacro : IMacro
-    {
-        string str;
-        string pair;\r
-        ManualResetEvent allDone = new ManualResetEvent(false);\r
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-         
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Google.Popup.Translate";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.InOutPopup;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "PopupTranslate";
-        }
-
-        public string Summary()
-        {
-            return "Google翻訳結果をポップアップ表示します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:2個").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("翻訳結果をポップアップで表示します").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("en ja ⇒ 英→日").Append(Environment.NewLine)
-                .Append("ja en ⇒ 日→英").Append(Environment.NewLine)
-                .ToString();
-        }
-
-        public string Execute(string str, string[] args)
-        {
-            return null;
-        }
-
-
-        public void ExecuteAsync(string str, string[] args)
-        {\r
-            try\r
-            {\r
-                this.str = str;\r
-                if (args == null)\r
-                    this.pair = "en%7Cja";\r
-                else if (args.Length == 1)\r
-                    this.pair = args[0] + "%7Cja";\r
-                else\r
-                    this.pair = args[0] + "%7C" + args[1];\r
-\r
-                WebRequest webReq = HttpWebRequest.Create("http://ajax.googleapis.com/ajax/services/language/translate");\r
-                webReq.Method = "POST";\r
-                webReq.ContentType = "application/x-www-form-urlencoded";\r
-\r
-                AsyncCallback writeCallBack = new AsyncCallback(WriteCallBack);\r
-                IAsyncResult r = webReq.BeginGetRequestStream(writeCallBack, webReq);\r
-                allDone.WaitOne();\r
-\r
-                AsyncCallback readCallBack = new AsyncCallback(ReadCallBack);\r
-                IAsyncResult rAr = webReq.BeginGetResponse(readCallBack, webReq);\r
-            }\r
-            catch (Exception e)\r
-            {\r
-                MessageBox.Show(e.Message);\r
-            }
-        }
-
-        private void ReadCallBack(IAsyncResult ar)
-        {\r
-            string result = "";\r
-            try\r
-            {\r
-                HttpWebRequest req = (HttpWebRequest)ar.AsyncState;\r
-                HttpWebResponse response = (HttpWebResponse)req.EndGetResponse(ar);\r
-                StreamReader sr = new StreamReader(response.GetResponseStream());\r
-                string str = sr.ReadToEnd();\r
-                sr.Close();\r
-\r
-                int index = str.IndexOf("\"translatedText\"");\r
-                if (index != -1)\r
-                {\r
-                    index += "\"translatedText\"".Length;\r
-                    int sIndex = str.IndexOf('"', index);\r
-                    int eIndex = str.IndexOf('"', sIndex + 1);\r
-\r
-                    result = str.Substring(sIndex + 1, eIndex - sIndex - 1);\r
-                    result = result.Replace("\\u003d", "\u003d").Replace("\\u0026", "\u0026");\r
-                    result = HttpUtility.HtmlDecode(result);\r
-                }\r
-            }\r
-            catch (Exception e)\r
-            {\r
-                result = e.Message;\r
-                macroCompletedEvent(result);\r
-                return;\r
-            }\r
-\r
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-        private void WriteCallBack(IAsyncResult ar)
-        {
-            HttpWebRequest req = (HttpWebRequest)ar.AsyncState;
-            StreamWriter sw = new StreamWriter(req.EndGetRequestStream(ar));
-            string parameters = "v=1.0&langpair=" + this.pair + "&q=" + HttpUtility.UrlEncode(this.str);
-            sw.Write(parameters);
-            sw.Close();\r
-            allDone.Set();\r
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-    }
-
-}
index ef8ece7..7ff0b79 100644 (file)
@@ -58,7 +58,6 @@
     <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="PopupTranslateMacro.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
diff --git a/macro.popup/PopupYomiganaMacro.cs b/macro.popup/PopupYomiganaMacro.cs
deleted file mode 100644 (file)
index 9beb1f5..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-using Lugens.Components.IME;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class PopupYomiganaMacro : IMacro
-    {
-        private ImeLanguage ime = new ImeLanguage();
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Popup.Yomigana";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.InOutPopup;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "PopupYomigana";
-        }
-
-        public string Summary()
-        {
-            return "漢字の読みをポップアップ表示します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:なし").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("漢字の読みをポップアップで表示します").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            string result = "";
-            if (!String.IsNullOrEmpty(str))
-            {
-                if (str.Length > 100)
-                    result = "100文字以内で選択してください";
-                else
-                    result = ime.GetYomi(str);
-
-            }
-            
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-    }
-}
index 6cd6c95..478a150 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D75F52B5-FE33-4777-8D41-92C9060DA5E9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Lugens.Passer.Macro.Popup</RootNamespace>
-    <AssemblyName>Lugens.Passer.Macro.Popup</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PopupYomiganaMacro.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\components\components.csproj">
-      <Project>{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}</Project>
-      <Name>components</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\passer\Passer.csproj">
-      <Project>{A51E566C-9BBE-4579-986B-31CD2E71FAE8}</Project>
-      <Name>Passer</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 および x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows インストーラー 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{D75F52B5-FE33-4777-8D41-92C9060DA5E9}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>Lugens.Passer.Macro.Popup</RootNamespace>\r
+    <AssemblyName>Lugens.Passer.Macro.Popup</AssemblyName>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+    <FileUpgradeFlags>\r
+    </FileUpgradeFlags>\r
+    <OldToolsVersion>3.5</OldToolsVersion>\r
+    <UpgradeBackupLocation />\r
+    <TargetFrameworkProfile />\r
+    <PublishUrl>publish\</PublishUrl>\r
+    <Install>true</Install>\r
+    <InstallFrom>Disk</InstallFrom>\r
+    <UpdateEnabled>false</UpdateEnabled>\r
+    <UpdateMode>Foreground</UpdateMode>\r
+    <UpdateInterval>7</UpdateInterval>\r
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
+    <UpdatePeriodically>false</UpdatePeriodically>\r
+    <UpdateRequired>false</UpdateRequired>\r
+    <MapFileExtensions>true</MapFileExtensions>\r
+    <ApplicationRevision>0</ApplicationRevision>\r
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
+    <IsWebBootstrapper>false</IsWebBootstrapper>\r
+    <UseApplicationTrust>false</UseApplicationTrust>\r
+    <BootstrapperEnabled>true</BootstrapperEnabled>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="app.config" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\components\components.csproj">\r
+      <Project>{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}</Project>\r
+      <Name>components</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\passer\Passer.csproj">\r
+      <Project>{A51E566C-9BBE-4579-986B-31CD2E71FAE8}</Project>\r
+      <Name>Passer</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">\r
+      <Visible>False</Visible>\r
+      <ProductName>Microsoft .NET Framework 4 %28x86 および x64%29</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
+      <Visible>False</Visible>\r
+      <ProductName>Windows インストーラー 3.1</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->\r
 </Project>
\ No newline at end of file
diff --git a/macro.text/TexToUpperMacro.cs b/macro.text/TexToUpperMacro.cs
deleted file mode 100644 (file)
index f2ae3e3..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextToUpperMacro : IMacro
-    {
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.ToUpper";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.CutOutText;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextToUpper";
-        }
-
-        public string Summary()
-        {
-            return "アルファベットの小文字を大文字に変換します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:なし").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("小文字を大文字に変換します").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("abcabc ⇒  ABCABC").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            string result = "";
-            if (!String.IsNullOrEmpty(str))
-                result = Strings.StrConv(str, VbStrConv.Uppercase, 0);
-
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-    }
-}
diff --git a/macro.text/TextDateTimeMacro.cs b/macro.text/TextDateTimeMacro.cs
deleted file mode 100644 (file)
index cc73890..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-using System.Globalization;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextDateTimeMacro : IMacro
-    {
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.DateTime";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.OutText;
-        }
-        
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextDateTime";
-        }
-
-        public string Summary()
-        {
-            return "現在の日付/時刻を出力します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:0~1個").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("引数なし    ⇒ 2010/01/01 01:23:45").Append(Environment.NewLine)
-                .Append("yyyy年M月d日  ⇒ 2010年1月1日").Append(Environment.NewLine)
-                .Append("MM月dd日    ⇒ 01月01日").Append(Environment.NewLine)
-                .Append("HH時mm分ss秒  ⇒ 01時23分45秒").Append(Environment.NewLine)
-                .Append("ggyy年MM月dd日 ⇒ 平成22年01月01日").Append(Environment.NewLine)
-                .Append("ggyy年⇔yyyy年 ⇒ 平成22年⇔2010年").Append(Environment.NewLine)
-                .ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            CultureInfo culture = new CultureInfo("ja-JP", true);
-            culture.DateTimeFormat.Calendar = new JapaneseCalendar();
-            DateTime dt = DateTime.Now;
-
-            if (args == null || args.Length == 0)
-            {
-                if (macroCompletedEvent != null)
-                    macroCompletedEvent(dt.ToString("yyyy/MM/dd HH:mm:ss"));
-                return;
-            }
-
-            string arg = "";
-            foreach (string s in args)
-            {
-                arg += s + " ";
-            }
-            arg = arg.Substring(0, arg.Length - 1);
-
-            string ggyy = dt.ToString("ggyy", culture);
-            arg = arg.Replace("ggyy", ggyy);
-
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(dt.ToString(arg));
-        }
-    }
-}
diff --git a/macro.text/TextSurroundMacro.cs b/macro.text/TextSurroundMacro.cs
deleted file mode 100644 (file)
index 3655ee3..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextSurroundMacro : IMacro
-    {
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.Surround";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.CutOutText;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextSurround";
-        }
-
-        public string Summary()
-        {
-            return "指定された文字で囲みます";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:1~2個").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストを").Append(Environment.NewLine)
-                .Append("指定された文字で囲みます").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("//       ⇒ //選択された文字列").Append(Environment.NewLine)
-                .Append("<!-- -->    ⇒ <!--選択された文字列-->").Append(Environment.NewLine)
-                .Append("\"<!-- \" \" -->\" ⇒ <!-- 選択された文字列 -->").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            int lineLen;
-            string s;
-            string[] lines;
-            StringBuilder sb = new StringBuilder();
-
-            if (args != null && args.Length > 0)
-            {
-                int len = args[0].Length;
-                if(args.Length > 1)
-                    len += args[1].Length;
-                lines = str.Replace("\r", "").Split('\n');
-                lineLen = lines.Length - 1;
-                for(int i = 0; i < lines.Length; i++)
-                {
-                    s = lines[i];
-                    if (i == lineLen && String.IsNullOrEmpty(s))
-                    {
-                        sb = sb.Append(Environment.NewLine);
-                        break;
-                    }
-
-                    if (args.Length == 1)
-                    {
-                        if (s.StartsWith(args[0]))
-                            sb = sb.Append(s.Substring(args[0].Length)).Append(Environment.NewLine);
-                        else
-                            sb = sb.Append(args[0]).Append(s).Append(Environment.NewLine);
-                    }
-                    else
-                    {
-                        if (len > s.Length)
-                            sb = sb.Append(args[0]).Append(s).Append(args[1]).Append(Environment.NewLine);
-                        else
-                        {
-                            if (s.StartsWith(args[0]) && s.Substring(s.Length - args[1].Length).Equals(args[1]))
-                                sb = sb.Append(s.Substring(args[0].Length, s.Length - len)).Append(Environment.NewLine);
-                            else
-                                sb = sb.Append(args[0]).Append(s).Append(args[1]).Append(Environment.NewLine);
-                        }
-                    }
-                }
-            }
-            sb = sb.Remove(sb.Length - Environment.NewLine.Length, Environment.NewLine.Length);
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(sb.ToString());
-        }
-    }
-}
diff --git a/macro.text/TextToHankakuMacro.cs b/macro.text/TextToHankakuMacro.cs
deleted file mode 100644 (file)
index f628f68..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextToHankakuMacro : IMacro
-    {
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.ToHankaku";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.CutOutText;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextToHankaku";
-        }
-
-        public string Summary()
-        {
-            return "全角文字を半角に変換します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:なし").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("全角文字を半角に変換します").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("アイウABCabc#$% ⇒ アイウABCabc#$%").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            string result = "";
-            if (!String.IsNullOrEmpty(str))
-                result = Strings.StrConv(str, VbStrConv.Narrow, 0);
-            
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-    }
-}
diff --git a/macro.text/TextToLowerMacro.cs b/macro.text/TextToLowerMacro.cs
deleted file mode 100644 (file)
index 753d57e..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextToLowerMacro : IMacro
-    {
-        
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.ToLower";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.CutOutText;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextToLower";
-        }
-
-        public string Summary()
-        {
-            return "アルファベットの大文字を小文字に変換します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:なし").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("大文字を小文字に変換します").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("ABCABC ⇒ abcabc").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            string result = "";
-            if (!String.IsNullOrEmpty(str))
-                result = Strings.StrConv(str, VbStrConv.Lowercase, 0);
-
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-    }
-}
diff --git a/macro.text/TextToSpaceMacro.cs b/macro.text/TextToSpaceMacro.cs
deleted file mode 100644 (file)
index 8d4d7a9..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextToSpaceMacro : IMacro
-    {
-        
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.ToSpace";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.CutOutText;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextToSpace";
-        }
-
-        public string Summary()
-        {
-            return "タブをスペースに変換します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:0~1個(タブ⇔スペースの文字数、デフォルトは4)").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("タブをスペースに変換します").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            int tab = 0;
-            int currentTab;
-            StringBuilder sb = new StringBuilder();
-            if (args != null && args.Length > 0)
-            {
-                if (!int.TryParse(args[0], out tab))
-                    tab = 4;
-            }
-
-            foreach (string line in str.Replace("\r", "").Split('\n'))
-            {
-                int len = line.Length;
-                currentTab = tab;
-                for (int i = 0; i < len; i++)
-                {
-                    char c = line[i];
-                    if (c == ' ')
-                    {
-                        sb.Append(' ');
-                        currentTab--;
-                        if (currentTab == 0)
-                            currentTab = tab;
-                    }
-                    else if (c == '\t')
-                    {
-                        while (currentTab > 0)
-                        {
-
-                            sb.Append(' ');
-                            currentTab--;
-                        }
-                        currentTab = tab;
-                    }
-                    else
-                    {
-                        sb.Append(line.Substring(i));
-                        break;
-                    }
-                }
-                sb.Append(Environment.NewLine);
-            }
-
-            string result = sb.Remove(sb.Length - 2, 2).ToString();
-
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-    }
-}
diff --git a/macro.text/TextToTabMacro.cs b/macro.text/TextToTabMacro.cs
deleted file mode 100644 (file)
index 75dfbe7..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextToTabMacro : IMacro
-    {
-        
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.ToTab";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.CutOutText;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextToTab";
-        }
-
-        public string Summary()
-        {
-            return "スペースをタブに変換します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:0~1個(タブ⇔スペースの文字数、デフォルトは4)").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("スペースをタブに変換します").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            int space = 4;
-            int currentSpace;
-            StringBuilder sb = new StringBuilder();
-
-            if (args != null && args.Length > 0)
-            {
-                if (!int.TryParse(args[0], out space))
-                    space = 4;
-            }
-
-            foreach (string line in str.Replace("\r", "").Split('\n'))
-            {
-                int len = line.Length;
-
-                currentSpace = 0;
-
-                for (int i = 0; i < len; i++)
-                {
-                    char c = line[i];
-                    if (c == ' ')
-                    {
-                        currentSpace++;
-                        if (currentSpace == space)
-                        {
-                            sb.Append("\t");
-                            currentSpace = 0;
-                        }
-                    }
-                    else
-                    {
-                        while (currentSpace > 0)
-                        {
-                            sb.Append(' ');
-                            currentSpace--;
-                        }
-                        sb.Append(line.Substring(i));
-                        break;
-                    }
-                }
-                sb.Append(Environment.NewLine);
-            }
-            string result = sb.Remove(sb.Length - 2, 2).ToString();
-
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-    }
-}
diff --git a/macro.text/TextToZenkakuMacro.cs b/macro.text/TextToZenkakuMacro.cs
deleted file mode 100644 (file)
index c0f1c6c..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualBasic;
-
-namespace Lugens.Passer.Macro.Text
-{
-    public class TextToZenkakuMacro : IMacro
-    {
-
-        event MacroEventHandler macroCompletedEvent;
-
-        event MacroEventHandler IMacro.OnMacroCompleted
-        {
-            add { macroCompletedEvent += value; }
-            remove { macroCompletedEvent -= value; }
-        }
-
-        public string Id()
-        {
-            return "Lugens.Passer.Macro.Text.ToZenkaku";
-        }
-
-        public MacroType Type()
-        {
-            return MacroType.CutOutText;
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public string Name()
-        {
-            return "TextToZenkaku";
-        }
-
-        public string Summary()
-        {
-            return "半角文字を全角に変換します";
-        }
-
-        public string Description()
-        {
-            return new StringBuilder()
-                .Append("引数:なし").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("クリップボード、または選択されたテキストの").Append(Environment.NewLine)
-                .Append("半角文字を全角に変換します").Append(Environment.NewLine)
-                .Append(Environment.NewLine)
-                .Append("アイウABCabc#$% ⇒ アイウABCabc#$%").ToString();
-        }
-
-        public bool Test()
-        {
-            return true;
-        }
-
-        public void ExecuteAsync(string str, string[] args)
-        {
-            string result = "";
-            if (!String.IsNullOrEmpty(str))
-                result = Strings.StrConv(str, VbStrConv.Wide, 0);
-
-            if (macroCompletedEvent != null)
-                macroCompletedEvent(result);
-        }
-
-
-    }
-}
index 17a0c26..01bf17b 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CCC07079-B8B2-4C11-B44A-E677E450C0E0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Macro.Text</RootNamespace>
-    <AssemblyName>Lugens.Passer.Macro.Text</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TexToUpperMacro.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TextToLowerMacro.cs" />
-    <Compile Include="TextToZenkakuMacro.cs" />
-    <Compile Include="TextToHankakuMacro.cs" />
-    <Compile Include="TextDateTimeMacro.cs" />
-    <Compile Include="TextSurroundMacro.cs" />
-    <Compile Include="TextToSpaceMacro.cs" />
-    <Compile Include="TextToTabMacro.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\components\components.csproj">
-      <Project>{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}</Project>
-      <Name>components</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\passer\Passer.csproj">
-      <Project>{A51E566C-9BBE-4579-986B-31CD2E71FAE8}</Project>
-      <Name>Passer</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 および x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows インストーラー 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{CCC07079-B8B2-4C11-B44A-E677E450C0E0}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>Macro.Text</RootNamespace>\r
+    <AssemblyName>Lugens.Passer.Macro.Text</AssemblyName>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+    <FileUpgradeFlags>\r
+    </FileUpgradeFlags>\r
+    <OldToolsVersion>3.5</OldToolsVersion>\r
+    <UpgradeBackupLocation />\r
+    <TargetFrameworkProfile />\r
+    <PublishUrl>publish\</PublishUrl>\r
+    <Install>true</Install>\r
+    <InstallFrom>Disk</InstallFrom>\r
+    <UpdateEnabled>false</UpdateEnabled>\r
+    <UpdateMode>Foreground</UpdateMode>\r
+    <UpdateInterval>7</UpdateInterval>\r
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
+    <UpdatePeriodically>false</UpdatePeriodically>\r
+    <UpdateRequired>false</UpdateRequired>\r
+    <MapFileExtensions>true</MapFileExtensions>\r
+    <ApplicationRevision>0</ApplicationRevision>\r
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
+    <IsWebBootstrapper>false</IsWebBootstrapper>\r
+    <UseApplicationTrust>false</UseApplicationTrust>\r
+    <BootstrapperEnabled>true</BootstrapperEnabled>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="Microsoft.VisualBasic" />\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\components\components.csproj">\r
+      <Project>{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}</Project>\r
+      <Name>components</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="app.config" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">\r
+      <Visible>False</Visible>\r
+      <ProductName>Microsoft .NET Framework 4 %28x86 および x64%29</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
+      <Visible>False</Visible>\r
+      <ProductName>Windows インストーラー 3.1</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->\r
 </Project>
\ No newline at end of file
similarity index 100%
rename from passer/Macro.cs
rename to macro/Macro.cs
diff --git a/macro/Properties/AssemblyInfo.cs b/macro/Properties/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..1cafbb3
--- /dev/null
@@ -0,0 +1,36 @@
+using System.Reflection;\r
+using System.Runtime.CompilerServices;\r
+using System.Runtime.InteropServices;\r
+\r
+// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。\r
+// アセンブリに関連付けられている情報を変更するには、\r
+// これらの属性値を変更してください。\r
+[assembly: AssemblyTitle("macro")]\r
+[assembly: AssemblyDescription("")]\r
+[assembly: AssemblyConfiguration("")]\r
+[assembly: AssemblyCompany("Microsoft")]\r
+[assembly: AssemblyProduct("macro")]\r
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]\r
+[assembly: AssemblyTrademark("")]\r
+[assembly: AssemblyCulture("")]\r
+\r
+// ComVisible を false に設定すると、その型はこのアセンブリ内で COM コンポーネントから \r
+// 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、\r
+// その型の ComVisible 属性を true に設定してください。\r
+[assembly: ComVisible(false)]\r
+\r
+// 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です\r
+[assembly: Guid("39263173-d1bc-440b-8ec6-9c39478a419e")]\r
+\r
+// アセンブリのバージョン情報は、以下の 4 つの値で構成されています:\r
+//\r
+//      Major Version\r
+//      Minor Version \r
+//      Build Number\r
+//      Revision\r
+//\r
+// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
+// 既定値にすることができます:\r
+// [assembly: AssemblyVersion("1.0.*")]\r
+[assembly: AssemblyVersion("1.0.0.0")]\r
+[assembly: AssemblyFileVersion("1.0.0.0")]\r
diff --git a/macro/app.config b/macro/app.config
new file mode 100644 (file)
index 0000000..f7a63ef
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>\r
+<configuration>\r
+    <system.serviceModel>\r
+        <bindings />\r
+        <client />\r
+    </system.serviceModel>\r
+</configuration>
\ No newline at end of file
diff --git a/macro/macro.csproj b/macro/macro.csproj
new file mode 100644 (file)
index 0000000..c5caf00
--- /dev/null
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>8.0.30703</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{F996BA5B-9969-4A2B-AD9A-B03D28AB4BC8}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>macro</RootNamespace>\r
+    <AssemblyName>macro</AssemblyName>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="Microsoft.VisualBasic" />\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Core" />\r
+    <Reference Include="System.Drawing" />\r
+    <Reference Include="System.Runtime.Serialization" />\r
+    <Reference Include="System.ServiceModel" />\r
+    <Reference Include="System.Windows.Forms" />\r
+    <Reference Include="System.Xml.Linq" />\r
+    <Reference Include="System.Data.DataSetExtensions" />\r
+    <Reference Include="Microsoft.CSharp" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="Macro.cs" />\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\components\components.csproj">\r
+      <Project>{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}</Project>\r
+      <Name>components</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\utils\utils.csproj">\r
+      <Project>{C3641419-1836-4403-A47F-238916CE1EFC}</Project>\r
+      <Name>utils</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="app.config" />\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+</Project>
\ No newline at end of file
diff --git a/macro/macro.sln b/macro/macro.sln
new file mode 100644 (file)
index 0000000..7b03c04
--- /dev/null
@@ -0,0 +1,20 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual Studio 2010\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "macro", "macro.csproj", "{F996BA5B-9969-4A2B-AD9A-B03D28AB4BC8}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {F996BA5B-9969-4A2B-AD9A-B03D28AB4BC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {F996BA5B-9969-4A2B-AD9A-B03D28AB4BC8}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {F996BA5B-9969-4A2B-AD9A-B03D28AB4BC8}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {F996BA5B-9969-4A2B-AD9A-B03D28AB4BC8}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/macro/macro.suo b/macro/macro.suo
new file mode 100644 (file)
index 0000000..0816133
Binary files /dev/null and b/macro/macro.suo differ
index cda4dd7..b42dfdc 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A51E566C-9BBE-4579-986B-31CD2E71FAE8}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Lugens.Passer</RootNamespace>
-    <AssemblyName>Passer</AssemblyName>
-    <ApplicationIcon>Resources\App.ico</ApplicationIcon>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.WindowsAPICodePack.Shell">
-      <HintPath>Resources\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json.Net20, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Release\Newtonsoft.Json.Net20.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AddCommandForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AddCommandForm.Designer.cs">
-      <DependentUpon>AddCommandForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="AddSentenceForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AddSentenceForm.Designer.cs">
-      <DependentUpon>AddSentenceForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Macro.cs" />
-    <Compile Include="KeyRecordParser.cs" />
-    <Compile Include="ProgramEngine.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="SentenceForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SentenceForm.Designer.cs">
-      <DependentUpon>SentenceForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Crypt.cs" />
-    <Compile Include="HotKeyProcess.cs" />
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainFormEvent.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainFormHook.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="AddEngineForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AddEngineForm.Designer.cs">
-      <DependentUpon>AddEngineForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="EditEngineForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="EditEngineForm.Designer.cs">
-      <DependentUpon>EditEngineForm.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="AddCommandForm.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>AddCommandForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AddSentenceForm.resx">
-      <DependentUpon>AddSentenceForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SentenceForm.resx">
-      <DependentUpon>SentenceForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SettingForm.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>SettingForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToolTipForm.resx">
-      <DependentUpon>ToolTipForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="VersionForm.resx">
-      <DependentUpon>VersionForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EditCommandForm.resx">
-      <DependentUpon>EditCommandForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EditSentenceForm.resx">
-      <DependentUpon>EditSentenceForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PopupForm.resx">
-      <DependentUpon>PopupForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AddEngineForm.resx">
-      <DependentUpon>AddEngineForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EditEngineForm.resx">
-      <DependentUpon>EditEngineForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="app.config" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="SettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SettingForm.Designer.cs">
-      <DependentUpon>SettingForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Settings.cs" />
-    <Compile Include="ShellLink.cs" />
-    <Compile Include="ToolTipForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ToolTipForm.Designer.cs">
-      <DependentUpon>ToolTipForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="VersionForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="EditCommandForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="EditCommandForm.Designer.cs">
-      <DependentUpon>EditCommandForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="EditSentenceForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="EditSentenceForm.Designer.cs">
-      <DependentUpon>EditSentenceForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PopupForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PopupForm.Designer.cs">
-      <DependentUpon>PopupForm.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\App.ico" />
-    <Content Include="Resources\AppRec.ico" />
-    <Content Include="Resources\cd_drive.ico" />
-    <Content Include="Resources\default_engine.ico" />
-    <Content Include="Resources\desktop.ico" />
-    <Content Include="Resources\document.ico" />
-    <Content Include="Resources\passer_search.ico" />
-    <Content Include="Resources\fix_drive.ico" />
-    <Content Include="Resources\history.ico" />
-    <Content Include="Resources\hold.png" />
-    <Content Include="Resources\loading.gif" />
-    <Content Include="Resources\net_drive.ico" />
-    <Content Include="Resources\passer_engine.ico" />
-    <Content Include="Resources\rem_drive.ico" />
-    <Content Include="Resources\script.ico" />
-    <Content Include="Resources\sentence.ico" />
-    <Content Include="Resources\skin.gif" />
-    <Content Include="Resources\win_drive.ico" />
-    <Content Include="Resources\macro.ico" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <None Include="Resources\select_7.png" />
-    <None Include="Resources\preselect_7.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows インストーラー 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\components\components.csproj">
-      <Project>{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}</Project>
-      <Name>components</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\utils.csproj">
-      <Project>{C3641419-1836-4403-A47F-238916CE1EFC}</Project>
-      <Name>utils</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>"D:\Dev\CorFlags.exe" passer.exe /32BIT+</PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{A51E566C-9BBE-4579-986B-31CD2E71FAE8}</ProjectGuid>\r
+    <OutputType>WinExe</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>Lugens.Passer</RootNamespace>\r
+    <AssemblyName>Passer</AssemblyName>\r
+    <ApplicationIcon>Resources\App.ico</ApplicationIcon>\r
+    <FileUpgradeFlags>\r
+    </FileUpgradeFlags>\r
+    <UpgradeBackupLocation>\r
+    </UpgradeBackupLocation>\r
+    <OldToolsVersion>3.5</OldToolsVersion>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
+    <IsWebBootstrapper>false</IsWebBootstrapper>\r
+    <PublishUrl>publish\</PublishUrl>\r
+    <Install>true</Install>\r
+    <InstallFrom>Disk</InstallFrom>\r
+    <UpdateEnabled>false</UpdateEnabled>\r
+    <UpdateMode>Foreground</UpdateMode>\r
+    <UpdateInterval>7</UpdateInterval>\r
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
+    <UpdatePeriodically>false</UpdatePeriodically>\r
+    <UpdateRequired>false</UpdateRequired>\r
+    <MapFileExtensions>true</MapFileExtensions>\r
+    <ApplicationRevision>0</ApplicationRevision>\r
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
+    <UseApplicationTrust>false</UseApplicationTrust>\r
+    <BootstrapperEnabled>true</BootstrapperEnabled>\r
+    <TargetFrameworkProfile />\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <UseVSHostingProcess>true</UseVSHostingProcess>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <UseVSHostingProcess>true</UseVSHostingProcess>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="Microsoft.VisualBasic" />\r
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell">\r
+      <HintPath>Resources\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="Newtonsoft.Json.Net20, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>bin\Release\Newtonsoft.Json.Net20.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="PresentationCore" />\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Deployment" />\r
+    <Reference Include="System.Drawing" />\r
+    <Reference Include="System.Web" />\r
+    <Reference Include="System.Windows.Forms" />\r
+    <Reference Include="System.Xaml" />\r
+    <Reference Include="System.Xml" />\r
+    <Reference Include="WindowsBase" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="AddCommandForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="AddCommandForm.Designer.cs">\r
+      <DependentUpon>AddCommandForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="AddSentenceForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="AddSentenceForm.Designer.cs">\r
+      <DependentUpon>AddSentenceForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="KeyRecordParser.cs" />\r
+    <Compile Include="macro\google\PopupTranslateMacro.cs" />\r
+    <Compile Include="macro\Macro.cs" />\r
+    <Compile Include="macro\Popup\PopupYomiganaMacro.cs" />\r
+    <Compile Include="macro\text\TextDateTimeMacro.cs" />\r
+    <Compile Include="macro\text\TexToUpperMacro.cs" />\r
+    <Compile Include="macro\text\TextSurroundMacro.cs" />\r
+    <Compile Include="macro\text\TextToHankakuMacro.cs" />\r
+    <Compile Include="macro\text\TextToLowerMacro.cs" />\r
+    <Compile Include="macro\text\TextToSpaceMacro.cs" />\r
+    <Compile Include="macro\text\TextToTabMacro.cs" />\r
+    <Compile Include="macro\text\TextToZenkakuMacro.cs" />\r
+    <Compile Include="ProgramEngine.cs" />\r
+    <Compile Include="Properties\Settings.Designer.cs">\r
+      <AutoGen>True</AutoGen>\r
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>\r
+      <DependentUpon>Settings.settings</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="SentenceForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="SentenceForm.Designer.cs">\r
+      <DependentUpon>SentenceForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Crypt.cs" />\r
+    <Compile Include="HotKeyProcess.cs" />\r
+    <Compile Include="MainForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="MainFormEvent.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="MainFormHook.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="Program.cs" />\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <Compile Include="AddEngineForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="AddEngineForm.Designer.cs">\r
+      <DependentUpon>AddEngineForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="EditEngineForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="EditEngineForm.Designer.cs">\r
+      <DependentUpon>EditEngineForm.cs</DependentUpon>\r
+    </Compile>\r
+    <EmbeddedResource Include="AddCommandForm.resx">\r
+      <SubType>Designer</SubType>\r
+      <DependentUpon>AddCommandForm.cs</DependentUpon>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="AddSentenceForm.resx">\r
+      <DependentUpon>AddSentenceForm.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="SentenceForm.resx">\r
+      <DependentUpon>SentenceForm.cs</DependentUpon>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="MainForm.resx">\r
+      <DependentUpon>MainForm.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="Properties\Resources.resx">\r
+      <Generator>ResXFileCodeGenerator</Generator>\r
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="SettingForm.resx">\r
+      <SubType>Designer</SubType>\r
+      <DependentUpon>SettingForm.cs</DependentUpon>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="ToolTipForm.resx">\r
+      <DependentUpon>ToolTipForm.cs</DependentUpon>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="VersionForm.resx">\r
+      <DependentUpon>VersionForm.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="EditCommandForm.resx">\r
+      <DependentUpon>EditCommandForm.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="EditSentenceForm.resx">\r
+      <DependentUpon>EditSentenceForm.cs</DependentUpon>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="PopupForm.resx">\r
+      <DependentUpon>PopupForm.cs</DependentUpon>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="AddEngineForm.resx">\r
+      <DependentUpon>AddEngineForm.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Include="EditEngineForm.resx">\r
+      <DependentUpon>EditEngineForm.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
+    <None Include="app.config" />\r
+    <Compile Include="Properties\Resources.Designer.cs">\r
+      <AutoGen>True</AutoGen>\r
+      <DesignTime>True</DesignTime>\r
+      <DependentUpon>Resources.resx</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="SettingForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="SettingForm.Designer.cs">\r
+      <DependentUpon>SettingForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Settings.cs" />\r
+    <Compile Include="ShellLink.cs" />\r
+    <Compile Include="ToolTipForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="ToolTipForm.Designer.cs">\r
+      <DependentUpon>ToolTipForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="VersionForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="EditCommandForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="EditCommandForm.Designer.cs">\r
+      <DependentUpon>EditCommandForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="EditSentenceForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="EditSentenceForm.Designer.cs">\r
+      <DependentUpon>EditSentenceForm.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="PopupForm.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="PopupForm.Designer.cs">\r
+      <DependentUpon>PopupForm.cs</DependentUpon>\r
+    </Compile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Content Include="Resources\App.ico" />\r
+    <Content Include="Resources\AppRec.ico" />\r
+    <Content Include="Resources\cd_drive.ico" />\r
+    <Content Include="Resources\default_engine.ico" />\r
+    <Content Include="Resources\desktop.ico" />\r
+    <Content Include="Resources\document.ico" />\r
+    <Content Include="Resources\passer_search.ico" />\r
+    <Content Include="Resources\fix_drive.ico" />\r
+    <Content Include="Resources\history.ico" />\r
+    <Content Include="Resources\hold.png" />\r
+    <Content Include="Resources\loading.gif" />\r
+    <Content Include="Resources\net_drive.ico" />\r
+    <Content Include="Resources\passer_engine.ico" />\r
+    <Content Include="Resources\rem_drive.ico" />\r
+    <Content Include="Resources\script.ico" />\r
+    <Content Include="Resources\sentence.ico" />\r
+    <Content Include="Resources\skin.gif" />\r
+    <Content Include="Resources\win_drive.ico" />\r
+    <Content Include="Resources\macro.ico" />\r
+    <None Include="Properties\Settings.settings">\r
+      <Generator>SettingsSingleFileGenerator</Generator>\r
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>\r
+    </None>\r
+    <None Include="Resources\select_7.png" />\r
+    <None Include="Resources\preselect_7.png" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
+      <Visible>False</Visible>\r
+      <ProductName>Windows インストーラー 3.1</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\components\components.csproj">\r
+      <Project>{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}</Project>\r
+      <Name>components</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\utils\utils.csproj">\r
+      <Project>{C3641419-1836-4403-A47F-238916CE1EFC}</Project>\r
+      <Name>utils</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
+  <PropertyGroup>\r
+    <PostBuildEvent>"D:\Dev\CorFlags.exe" passer.exe /32BIT+</PostBuildEvent>\r
+  </PropertyGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->\r
 </Project>
\ No newline at end of file
index 8b39f26..2569b55 100644 (file)
@@ -1,59 +1,35 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Passer", "Passer.csproj", "{A51E566C-9BBE-4579-986B-31CD2E71FAE8}"
-       ProjectSection(ProjectDependencies) = postProject
-               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400} = {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}
-       EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "components", "..\components\components.csproj", "{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utils", "..\utils\utils.csproj", "{C3641419-1836-4403-A47F-238916CE1EFC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "macro.text", "..\macro.text\macro.text.csproj", "{CCC07079-B8B2-4C11-B44A-E677E450C0E0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "macro.bing", "..\macro.bing\macro.bing.csproj", "{1E59DD0D-5EC3-4335-855F-3A34C0D4BC09}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "macro.google", "..\macro.google\macro.google.csproj", "{54C23C22-8DDB-46D6-B6FB-65D1DF1BB26D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "macro.popup", "..\macro.popup\macro.popup.csproj", "{D75F52B5-FE33-4777-8D41-92C9060DA5E9}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Any CPU = Debug|Any CPU
-               Release|Any CPU = Release|Any CPU
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Release|Any CPU.Build.0 = Release|Any CPU
-               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Release|Any CPU.Build.0 = Release|Any CPU
-               {C3641419-1836-4403-A47F-238916CE1EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {C3641419-1836-4403-A47F-238916CE1EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {C3641419-1836-4403-A47F-238916CE1EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {C3641419-1836-4403-A47F-238916CE1EFC}.Release|Any CPU.Build.0 = Release|Any CPU
-               {CCC07079-B8B2-4C11-B44A-E677E450C0E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {CCC07079-B8B2-4C11-B44A-E677E450C0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {CCC07079-B8B2-4C11-B44A-E677E450C0E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {CCC07079-B8B2-4C11-B44A-E677E450C0E0}.Release|Any CPU.Build.0 = Release|Any CPU
-               {1E59DD0D-5EC3-4335-855F-3A34C0D4BC09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {1E59DD0D-5EC3-4335-855F-3A34C0D4BC09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {1E59DD0D-5EC3-4335-855F-3A34C0D4BC09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {1E59DD0D-5EC3-4335-855F-3A34C0D4BC09}.Release|Any CPU.Build.0 = Release|Any CPU
-               {54C23C22-8DDB-46D6-B6FB-65D1DF1BB26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {54C23C22-8DDB-46D6-B6FB-65D1DF1BB26D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {54C23C22-8DDB-46D6-B6FB-65D1DF1BB26D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {54C23C22-8DDB-46D6-B6FB-65D1DF1BB26D}.Release|Any CPU.Build.0 = Release|Any CPU
-               {D75F52B5-FE33-4777-8D41-92C9060DA5E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {D75F52B5-FE33-4777-8D41-92C9060DA5E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {D75F52B5-FE33-4777-8D41-92C9060DA5E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {D75F52B5-FE33-4777-8D41-92C9060DA5E9}.Release|Any CPU.Build.0 = Release|Any CPU
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
+\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual Studio 2010\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Passer", "Passer.csproj", "{A51E566C-9BBE-4579-986B-31CD2E71FAE8}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400} = {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}\r
+       EndProjectSection\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "components", "..\components\components.csproj", "{AC0C275B-50AF-49C6-B2ED-E69EE12C5400}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utils", "..\utils\utils.csproj", "{C3641419-1836-4403-A47F-238916CE1EFC}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {A51E566C-9BBE-4579-986B-31CD2E71FAE8}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {AC0C275B-50AF-49C6-B2ED-E69EE12C5400}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {C3641419-1836-4403-A47F-238916CE1EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {C3641419-1836-4403-A47F-238916CE1EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {C3641419-1836-4403-A47F-238916CE1EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {C3641419-1836-4403-A47F-238916CE1EFC}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
index 26c9c75..4562eff 100644 (file)
Binary files a/passer/Passer.suo and b/passer/Passer.suo differ
index 821f283..2568ed4 100644 (file)
@@ -936,11 +936,9 @@ namespace Lugens.Passer
             MacroDic.Clear();
             MacroNameDic.Clear();
 
-            if (!Directory.Exists(Program.MacroDirectory))
-                return true;
-
-            string typeName = typeof(IMacro).FullName;
-            string[] dlls = Directory.GetFiles(Program.MacroDirectory, "*.dll");
+            string typeName = typeof(IMacro).FullName;\r
+            //string[] dlls = Directory.GetFiles(Program.MacroDirectory, "*.dll");\r
+            string[] dlls = Directory.GetFiles(".\\", "*.exe");\r
             try
             {
                 foreach (string dll in dlls)
index 6b8cacf..f390772 100644 (file)
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Lugens")]
 [assembly: AssemblyProduct("Passer")]
-[assembly: AssemblyCopyright("Copyright(C) 2009-2010 Lugens")]
+[assembly: AssemblyCopyright("Copyright(C) 2009-2011 Lugens")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.6.1.4")]
-[assembly: AssemblyFileVersion("2.6.1.4")]
+[assembly: AssemblyVersion("2.6.1.5")]
+[assembly: AssemblyFileVersion("2.6.1.5")]
diff --git a/passer/bin/Release/macro/Lugens.Passer.Macro.Google.dll b/passer/bin/Release/macro/Lugens.Passer.Macro.Google.dll
deleted file mode 100644 (file)
index 8534d29..0000000
Binary files a/passer/bin/Release/macro/Lugens.Passer.Macro.Google.dll and /dev/null differ
diff --git a/passer/bin/Release/macro/Lugens.Passer.Macro.Popup.dll b/passer/bin/Release/macro/Lugens.Passer.Macro.Popup.dll
deleted file mode 100644 (file)
index fb60039..0000000
Binary files a/passer/bin/Release/macro/Lugens.Passer.Macro.Popup.dll and /dev/null differ
diff --git a/passer/bin/Release/macro/Lugens.Passer.Macro.Text.dll b/passer/bin/Release/macro/Lugens.Passer.Macro.Text.dll
deleted file mode 100644 (file)
index c31a8d5..0000000
Binary files a/passer/bin/Release/macro/Lugens.Passer.Macro.Text.dll and /dev/null differ