diff --git a/CBLabs.CybozuConnect/App.cs b/CBLabs.CybozuConnect/App.cs index 96b352a..8ae5ab5 100644 --- a/CBLabs.CybozuConnect/App.cs +++ b/CBLabs.CybozuConnect/App.cs @@ -41,7 +41,7 @@ public App(string url) { this.cybozuType = CybozuType.Garoon; } - else if (url.IndexOf(".cybozu.com/g/") >= 0) + else if (url.IndexOf(".cybozu.com/g/") >= 0 || url.IndexOf(".cybozu.cn/g/") >= 0) { this.cybozuType = CybozuType.GaroonCloud; } diff --git a/CBLabs.CybozuConnect/Properties/AssemblyInfo.cs b/CBLabs.CybozuConnect/Properties/AssemblyInfo.cs index 8dcead2..61db83a 100644 --- a/CBLabs.CybozuConnect/Properties/AssemblyInfo.cs +++ b/CBLabs.CybozuConnect/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.*")] //[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.1")] +[assembly: AssemblyInformationalVersion("1.0.5")] diff --git a/Cybozu.CrossSync Setup/Cybozu.CrossSync Setup.vdproj b/Cybozu.CrossSync Setup/Cybozu.CrossSync Setup.vdproj index 1340b96..463a9b0 100644 --- a/Cybozu.CrossSync Setup/Cybozu.CrossSync Setup.vdproj +++ b/Cybozu.CrossSync Setup/Cybozu.CrossSync Setup.vdproj @@ -21,6 +21,12 @@ } "Entry" { + "MsmKey" = "8:_09FEF9D5331D4F6C8D8D3ED69E020106" + "OwnerKey" = "8:_086B4B3C691D4C13B634EF324B765A33" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5C9C60BEC7724B23AD508ABD0AE94915" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -51,12 +57,6 @@ } "Entry" { - "MsmKey" = "8:_EFD307D5C5AA61530E10C51F20AAFD1E" - "OwnerKey" = "8:_086B4B3C691D4C13B634EF324B765A33" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_FDFCB6CA4AAF4256A35E559E9656EE3B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -76,7 +76,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EFD307D5C5AA61530E10C51F20AAFD1E" + "OwnerKey" = "8:_09FEF9D5331D4F6C8D8D3ED69E020106" "MsmSig" = "8:_UNDEFINED" } } @@ -87,7 +87,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\CrossSync-1.0.4.msi" + "OutputFilename" = "8:Debug\\CrossSync-1.0.5.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -124,7 +124,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\CrossSync-1.0.4.msi" + "OutputFilename" = "8:Release\\CrossSync-1.0.5.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -240,10 +240,21 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C9C60BEC7724B23AD508ABD0AE94915" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_09FEF9D5331D4F6C8D8D3ED69E020106" { - "SourcePath" = "8:CustomActionCreateStartup.vbs" - "TargetName" = "8:CustomActionCreateStartup.vbs" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:CBLabs.CybozuConnect, Version=1.0.5491.32387, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_09FEF9D5331D4F6C8D8D3ED69E020106" + { + "Name" = "8:CBLabs.CybozuConnect.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:CBLabs.CybozuConnect.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51" "Condition" = "8:" @@ -257,13 +268,13 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:TRUE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_795121C28ABB4EBBA07410DA20DFD6A1" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C9C60BEC7724B23AD508ABD0AE94915" { - "SourcePath" = "8:CustomActionStop.vbs" - "TargetName" = "8:CustomActionStop.vbs" + "SourcePath" = "8:CustomActionCreateStartup.vbs" + "TargetName" = "8:CustomActionCreateStartup.vbs" "Tag" = "8:" "Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51" "Condition" = "8:" @@ -280,10 +291,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6D37602E29244DE8F4F266009C7EC66" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_795121C28ABB4EBBA07410DA20DFD6A1" { - "SourcePath" = "8:CustomActionStart.vbs" - "TargetName" = "8:CustomActionStart.vbs" + "SourcePath" = "8:CustomActionStop.vbs" + "TargetName" = "8:CustomActionStop.vbs" "Tag" = "8:" "Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51" "Condition" = "8:" @@ -300,10 +311,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CED1854AE9AE4726804FC56CD37BEF85" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6D37602E29244DE8F4F266009C7EC66" { - "SourcePath" = "8:CustomActionDeleteStartup.vbs" - "TargetName" = "8:CustomActionDeleteStartup.vbs" + "SourcePath" = "8:CustomActionStart.vbs" + "TargetName" = "8:CustomActionStart.vbs" "Tag" = "8:" "Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51" "Condition" = "8:" @@ -320,16 +331,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EFD307D5C5AA61530E10C51F20AAFD1E" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CED1854AE9AE4726804FC56CD37BEF85" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:CBLabs.CybozuConnect, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:CBLabs.CybozuConnect.dll" - "TargetName" = "8:" + "SourcePath" = "8:CustomActionDeleteStartup.vbs" + "TargetName" = "8:CustomActionDeleteStartup.vbs" "Tag" = "8:" "Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51" "Condition" = "8:" @@ -343,7 +348,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FDFCB6CA4AAF4256A35E559E9656EE3B" @@ -433,20 +438,20 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Cybozu CrossSync" - "ProductCode" = "8:{58792729-F14F-477D-97BF-67097376C382}" - "PackageCode" = "8:{6F035257-C61B-4DC9-BB9C-36BA62CE7252}" + "ProductCode" = "8:{840E0454-6B8F-4228-A1D5-F6E09A650102}" + "PackageCode" = "8:{5763D3C6-15E8-4BC1-B7B6-71C3CF4790C9}" "UpgradeCode" = "8:{64C6CDDD-B1F1-4D42-8DAD-00A63A741633}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.4" + "ProductVersion" = "8:1.0.5" "Manufacturer" = "8:Cybozu Labs" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:Cybozu CrossSync Setup" - "Subject" = "8:Cybozu CrossSync 1.0.4" + "Subject" = "8:Cybozu CrossSync 1.0.5" "ARPCONTACT" = "8:Cybozu Labs, Inc." "Keywords" = "8:" "ARPCOMMENTS" = "8:" diff --git a/Cybozu.CrossSync/Properties/AssemblyInfo.cs b/Cybozu.CrossSync/Properties/AssemblyInfo.cs index 30e686f..904bf68 100644 --- a/Cybozu.CrossSync/Properties/AssemblyInfo.cs +++ b/Cybozu.CrossSync/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.*")] //[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.4")] +[assembly: AssemblyInformationalVersion("1.0.5")] diff --git a/Cybozu.CrossSync/Resources.Designer.cs b/Cybozu.CrossSync/Resources.Designer.cs index aec7ed1..41f7fe4 100644 --- a/Cybozu.CrossSync/Resources.Designer.cs +++ b/Cybozu.CrossSync/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // このコードはツールによって生成されました。 -// ランタイム バージョン:4.0.30319.1 +// ランタイム バージョン:4.0.30319.18444 // // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 // コードが再生成されるときに損失したりします。 @@ -135,5 +135,14 @@ internal static string ProductName { return ResourceManager.GetString("ProductName", resourceCulture); } } + + /// + /// URL is invalid. に類似しているローカライズされた文字列を検索します。 + /// + internal static string URLIsInvalid { + get { + return ResourceManager.GetString("URLIsInvalid", resourceCulture); + } + } } } diff --git a/Cybozu.CrossSync/Resources.ja.resx b/Cybozu.CrossSync/Resources.ja.resx index 7d6ad92..71d77ef 100644 --- a/Cybozu.CrossSync/Resources.ja.resx +++ b/Cybozu.CrossSync/Resources.ja.resx @@ -145,4 +145,7 @@ Cybozu CrossSync はサイボウズ Office の連携APIを利用しています Cybozu CrossSync + + 無効なURLです。 + \ No newline at end of file diff --git a/Cybozu.CrossSync/Resources.resx b/Cybozu.CrossSync/Resources.resx index 1b97256..1560247 100644 --- a/Cybozu.CrossSync/Resources.resx +++ b/Cybozu.CrossSync/Resources.resx @@ -145,4 +145,7 @@ Cybozu CrossSync uses Cybozu Office API. Depending on the version of the prorudc Cybozu CrossSync + + URL is invalid. + \ No newline at end of file diff --git a/Cybozu.CrossSync/SettingForm.cs b/Cybozu.CrossSync/SettingForm.cs index 9b39cdc..c415ac5 100644 --- a/Cybozu.CrossSync/SettingForm.cs +++ b/Cybozu.CrossSync/SettingForm.cs @@ -139,7 +139,19 @@ private bool Apply() } string url1 = TrimUrl(this.firstUrl.Text); + if (string.IsNullOrEmpty(url1)) + { + MessageBox.Show(string.Format(Resources.Account1Error, Resources.URLIsInvalid), Resources.ProductName); + return false; + } + string url2 = TrimUrl(this.secondUrl.Text); + if (string.IsNullOrEmpty(url2)) + { + MessageBox.Show(string.Format(Resources.Account2Error, Resources.URLIsInvalid), Resources.ProductName); + return false; + } + App app; try @@ -155,6 +167,11 @@ private bool Apply() } return false; } + catch (UriFormatException ex) + { + MessageBox.Show(ex.Message); + return false; + } catch (WebException ex) { MessageBox.Show(ex.Message); @@ -179,6 +196,11 @@ private bool Apply() } return false; } + catch (UriFormatException ex) + { + MessageBox.Show(ex.Message); + return false; + } catch (WebException ex) { MessageBox.Show(ex.Message); @@ -261,7 +283,7 @@ protected void Sync(bool showError) protected string TrimUrl(string url) { - string[] EndMarks = { ".exe", ".cgi", ".cybozu.com/g/" }; + string[] EndMarks = { ".exe", ".cgi", ".cybozu.com/g/", ".cybozu.cn/g/" }; foreach (string endMark in EndMarks) { if (url.EndsWith(endMark)) return url; diff --git a/README.md b/README.md index 143f1b3..df66975 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,13 @@ Cybozu CrossSync は2つのサイボウズ製品のスケジュールをバッ -------------- ### クライアント側 * Windows 7 +* Windows 8 インストール ------------ サーバーマシンではなく、 **クライアントのPCにインストール** します。 -1. **[ダウンロード](http://hatashinya.github.io/cybozu-crosssync/)** ページからインストーラー（ **CrossSync-1.0.*.msi** ）をダウンロードします。 +1. **[Releases](https://github.com/hatashinya/cybozu-crosssync/releases)** ページからインストーラー（ **CrossSync-1.0.*.msi** ）をダウンロードします。 2. ダウンロードしたインストーラーをダブルクリックして起動します。 3. インストーラーにしたがって、以下の項目を指定します。 * インストール場所 @@ -51,7 +52,7 @@ URLの指定について ----------------- 同期するサイボウズ製品のURLの指定方法は以下の通りとなります。 -* サイボウズ(R) Office(R) 8 または 9 +* サイボウズ(R) Office(R) * 例） `http://example.com/scripts/cbag/ag.exe` * 例） `http://example.com/cgi-bin/cbag/ag.cgi` * サイボウズ(R) ガルーン(R)