Skip to content

Commit 808bd80

Browse files
hatashinyahatashinya
committed
cybozu.cn
1 parent 76c2827 commit 808bd80

File tree

9 files changed

+86
-43
lines changed

9 files changed

+86
-43
lines changed

‎CBLabs.CybozuConnect/App.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public App(string url)
4141
{
4242
this.cybozuType = CybozuType.Garoon;
4343
}
44-
else if (url.IndexOf(".cybozu.com/g/") >= 0)
44+
else if (url.IndexOf(".cybozu.com/g/") >= 0 || url.IndexOf(".cybozu.cn/g/") >= 0)
4545
{
4646
this.cybozuType = CybozuType.GaroonCloud;
4747
}

‎CBLabs.CybozuConnect/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.*")]
3636
//[assembly: AssemblyFileVersion("1.0.0.0")]
37-
[assembly: AssemblyInformationalVersion("1.0.1")]
37+
[assembly: AssemblyInformationalVersion("1.0.5")]

‎Cybozu.CrossSync Setup/Cybozu.CrossSync Setup.vdproj‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
}
2222
"Entry"
2323
{
24+
"MsmKey" = "8:_09FEF9D5331D4F6C8D8D3ED69E020106"
25+
"OwnerKey" = "8:_086B4B3C691D4C13B634EF324B765A33"
26+
"MsmSig" = "8:_UNDEFINED"
27+
}
28+
"Entry"
29+
{
2430
"MsmKey" = "8:_5C9C60BEC7724B23AD508ABD0AE94915"
2531
"OwnerKey" = "8:_UNDEFINED"
2632
"MsmSig" = "8:_UNDEFINED"
@@ -51,12 +57,6 @@
5157
}
5258
"Entry"
5359
{
54-
"MsmKey" = "8:_EFD307D5C5AA61530E10C51F20AAFD1E"
55-
"OwnerKey" = "8:_086B4B3C691D4C13B634EF324B765A33"
56-
"MsmSig" = "8:_UNDEFINED"
57-
}
58-
"Entry"
59-
{
6060
"MsmKey" = "8:_FDFCB6CA4AAF4256A35E559E9656EE3B"
6161
"OwnerKey" = "8:_UNDEFINED"
6262
"MsmSig" = "8:_UNDEFINED"
@@ -76,7 +76,7 @@
7676
"Entry"
7777
{
7878
"MsmKey" = "8:_UNDEFINED"
79-
"OwnerKey" = "8:_EFD307D5C5AA61530E10C51F20AAFD1E"
79+
"OwnerKey" = "8:_09FEF9D5331D4F6C8D8D3ED69E020106"
8080
"MsmSig" = "8:_UNDEFINED"
8181
}
8282
}
@@ -87,7 +87,7 @@
8787
"DisplayName" = "8:Debug"
8888
"IsDebugOnly" = "11:TRUE"
8989
"IsReleaseOnly" = "11:FALSE"
90-
"OutputFilename" = "8:Debug\\CrossSync-1.0.4.msi"
90+
"OutputFilename" = "8:Debug\\CrossSync-1.0.5.msi"
9191
"PackageFilesAs" = "3:2"
9292
"PackageFileSize" = "3:-2147483648"
9393
"CabType" = "3:1"
@@ -124,7 +124,7 @@
124124
"DisplayName" = "8:Release"
125125
"IsDebugOnly" = "11:FALSE"
126126
"IsReleaseOnly" = "11:TRUE"
127-
"OutputFilename" = "8:Release\\CrossSync-1.0.4.msi"
127+
"OutputFilename" = "8:Release\\CrossSync-1.0.5.msi"
128128
"PackageFilesAs" = "3:2"
129129
"PackageFileSize" = "3:-2147483648"
130130
"CabType" = "3:1"
@@ -240,10 +240,21 @@
240240
}
241241
"File"
242242
{
243-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C9C60BEC7724B23AD508ABD0AE94915"
243+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_09FEF9D5331D4F6C8D8D3ED69E020106"
244244
{
245-
"SourcePath" = "8:CustomActionCreateStartup.vbs"
246-
"TargetName" = "8:CustomActionCreateStartup.vbs"
245+
"AssemblyRegister" = "3:1"
246+
"AssemblyIsInGAC" = "11:FALSE"
247+
"AssemblyAsmDisplayName" = "8:CBLabs.CybozuConnect, Version=1.0.5491.32387, Culture=neutral, processorArchitecture=MSIL"
248+
"ScatterAssemblies"
249+
{
250+
"_09FEF9D5331D4F6C8D8D3ED69E020106"
251+
{
252+
"Name" = "8:CBLabs.CybozuConnect.dll"
253+
"Attributes" = "3:512"
254+
}
255+
}
256+
"SourcePath" = "8:CBLabs.CybozuConnect.dll"
257+
"TargetName" = "8:"
247258
"Tag" = "8:"
248259
"Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51"
249260
"Condition" = "8:"
@@ -257,13 +268,13 @@
257268
"PackageAs" = "3:1"
258269
"Register" = "3:1"
259270
"Exclude" = "11:TRUE"
260-
"IsDependency" = "11:FALSE"
271+
"IsDependency" = "11:TRUE"
261272
"IsolateTo" = "8:"
262273
}
263-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_795121C28ABB4EBBA07410DA20DFD6A1"
274+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C9C60BEC7724B23AD508ABD0AE94915"
264275
{
265-
"SourcePath" = "8:CustomActionStop.vbs"
266-
"TargetName" = "8:CustomActionStop.vbs"
276+
"SourcePath" = "8:CustomActionCreateStartup.vbs"
277+
"TargetName" = "8:CustomActionCreateStartup.vbs"
267278
"Tag" = "8:"
268279
"Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51"
269280
"Condition" = "8:"
@@ -280,10 +291,10 @@
280291
"IsDependency" = "11:FALSE"
281292
"IsolateTo" = "8:"
282293
}
283-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6D37602E29244DE8F4F266009C7EC66"
294+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_795121C28ABB4EBBA07410DA20DFD6A1"
284295
{
285-
"SourcePath" = "8:CustomActionStart.vbs"
286-
"TargetName" = "8:CustomActionStart.vbs"
296+
"SourcePath" = "8:CustomActionStop.vbs"
297+
"TargetName" = "8:CustomActionStop.vbs"
287298
"Tag" = "8:"
288299
"Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51"
289300
"Condition" = "8:"
@@ -300,10 +311,10 @@
300311
"IsDependency" = "11:FALSE"
301312
"IsolateTo" = "8:"
302313
}
303-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CED1854AE9AE4726804FC56CD37BEF85"
314+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6D37602E29244DE8F4F266009C7EC66"
304315
{
305-
"SourcePath" = "8:CustomActionDeleteStartup.vbs"
306-
"TargetName" = "8:CustomActionDeleteStartup.vbs"
316+
"SourcePath" = "8:CustomActionStart.vbs"
317+
"TargetName" = "8:CustomActionStart.vbs"
307318
"Tag" = "8:"
308319
"Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51"
309320
"Condition" = "8:"
@@ -320,16 +331,10 @@
320331
"IsDependency" = "11:FALSE"
321332
"IsolateTo" = "8:"
322333
}
323-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EFD307D5C5AA61530E10C51F20AAFD1E"
334+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CED1854AE9AE4726804FC56CD37BEF85"
324335
{
325-
"AssemblyRegister" = "3:1"
326-
"AssemblyIsInGAC" = "11:FALSE"
327-
"AssemblyAsmDisplayName" = "8:CBLabs.CybozuConnect, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
328-
"ScatterAssemblies"
329-
{
330-
}
331-
"SourcePath" = "8:CBLabs.CybozuConnect.dll"
332-
"TargetName" = "8:"
336+
"SourcePath" = "8:CustomActionDeleteStartup.vbs"
337+
"TargetName" = "8:CustomActionDeleteStartup.vbs"
333338
"Tag" = "8:"
334339
"Folder" = "8:_37AD96AEB9844BD9AA5F99D338D38B51"
335340
"Condition" = "8:"
@@ -343,7 +348,7 @@
343348
"PackageAs" = "3:1"
344349
"Register" = "3:1"
345350
"Exclude" = "11:TRUE"
346-
"IsDependency" = "11:TRUE"
351+
"IsDependency" = "11:FALSE"
347352
"IsolateTo" = "8:"
348353
}
349354
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FDFCB6CA4AAF4256A35E559E9656EE3B"
@@ -433,20 +438,20 @@
433438
{
434439
"Name" = "8:Microsoft Visual Studio"
435440
"ProductName" = "8:Cybozu CrossSync"
436-
"ProductCode" = "8:{58792729-F14F-477D-97BF-67097376C382}"
437-
"PackageCode" = "8:{6F035257-C61B-4DC9-BB9C-36BA62CE7252}"
441+
"ProductCode" = "8:{840E0454-6B8F-4228-A1D5-F6E09A650102}"
442+
"PackageCode" = "8:{5763D3C6-15E8-4BC1-B7B6-71C3CF4790C9}"
438443
"UpgradeCode" = "8:{64C6CDDD-B1F1-4D42-8DAD-00A63A741633}"
439444
"AspNetVersion" = "8:4.0.30319.0"
440445
"RestartWWWService" = "11:FALSE"
441446
"RemovePreviousVersions" = "11:TRUE"
442447
"DetectNewerInstalledVersion" = "11:TRUE"
443448
"InstallAllUsers" = "11:FALSE"
444-
"ProductVersion" = "8:1.0.4"
449+
"ProductVersion" = "8:1.0.5"
445450
"Manufacturer" = "8:Cybozu Labs"
446451
"ARPHELPTELEPHONE" = "8:"
447452
"ARPHELPLINK" = "8:"
448453
"Title" = "8:Cybozu CrossSync Setup"
449-
"Subject" = "8:Cybozu CrossSync 1.0.4"
454+
"Subject" = "8:Cybozu CrossSync 1.0.5"
450455
"ARPCONTACT" = "8:Cybozu Labs, Inc."
451456
"Keywords" = "8:"
452457
"ARPCOMMENTS" = "8:"

‎Cybozu.CrossSync/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.*")]
3636
//[assembly: AssemblyFileVersion("1.0.0.0")]
37-
[assembly: AssemblyInformationalVersion("1.0.4")]
37+
[assembly: AssemblyInformationalVersion("1.0.5")]

‎Cybozu.CrossSync/Resources.Designer.cs‎

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cybozu.CrossSync/Resources.ja.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,7 @@ Cybozu CrossSync はサイボウズ Office の連携APIを利用しています
145145
<data name="ProductName" xml:space="preserve">
146146
<value>Cybozu CrossSync</value>
147147
</data>
148+
<data name="URLIsInvalid" xml:space="preserve">
149+
<value>無効なURLです。</value>
150+
</data>
148151
</root>

‎Cybozu.CrossSync/Resources.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,7 @@ Cybozu CrossSync uses Cybozu Office API. Depending on the version of the prorudc
145145
<data name="ProductName" xml:space="preserve">
146146
<value>Cybozu CrossSync</value>
147147
</data>
148+
<data name="URLIsInvalid" xml:space="preserve">
149+
<value>URL is invalid.</value>
150+
</data>
148151
</root>

‎Cybozu.CrossSync/SettingForm.cs‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,19 @@ private bool Apply()
139139
}
140140

141141
string url1 = TrimUrl(this.firstUrl.Text);
142+
if (string.IsNullOrEmpty(url1))
143+
{
144+
MessageBox.Show(string.Format(Resources.Account1Error, Resources.URLIsInvalid), Resources.ProductName);
145+
return false;
146+
}
147+
142148
string url2 = TrimUrl(this.secondUrl.Text);
149+
if (string.IsNullOrEmpty(url2))
150+
{
151+
MessageBox.Show(string.Format(Resources.Account2Error, Resources.URLIsInvalid), Resources.ProductName);
152+
return false;
153+
}
154+
143155
App app;
144156

145157
try
@@ -155,6 +167,11 @@ private bool Apply()
155167
}
156168
return false;
157169
}
170+
catch (UriFormatException ex)
171+
{
172+
MessageBox.Show(ex.Message);
173+
return false;
174+
}
158175
catch (WebException ex)
159176
{
160177
MessageBox.Show(ex.Message);
@@ -179,6 +196,11 @@ private bool Apply()
179196
}
180197
return false;
181198
}
199+
catch (UriFormatException ex)
200+
{
201+
MessageBox.Show(ex.Message);
202+
return false;
203+
}
182204
catch (WebException ex)
183205
{
184206
MessageBox.Show(ex.Message);
@@ -261,7 +283,7 @@ protected void Sync(bool showError)
261283

262284
protected string TrimUrl(string url)
263285
{
264-
string[] EndMarks = { ".exe", ".cgi", ".cybozu.com/g/" };
286+
string[] EndMarks = { ".exe", ".cgi", ".cybozu.com/g/", ".cybozu.cn/g/" };
265287
foreach (string endMark in EndMarks)
266288
{
267289
if (url.EndsWith(endMark)) return url;

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ Cybozu CrossSync は2つのサイボウズ製品のスケジュールをバッ
3535
--------------
3636
### クライアント側
3737
* Windows 7
38+
* Windows 8
3839

3940
インストール
4041
------------
4142
サーバーマシンではなく、 **クライアントのPCにインストール** します。
4243

43-
1. **[ダウンロード](http://hatashinya.github.io/cybozu-crosssync/)** ページからインストーラー（ **CrossSync-1.0.*.msi** ）をダウンロードします。
44+
1. **[Releases](https://github.com/hatashinya/cybozu-crosssync/releases)** ページからインストーラー（ **CrossSync-1.0.*.msi** ）をダウンロードします。
4445
2. ダウンロードしたインストーラーをダブルクリックして起動します。
4546
3. インストーラーにしたがって、以下の項目を指定します。
4647
* インストール場所
@@ -51,7 +52,7 @@ URLの指定について
5152
-----------------
5253
同期するサイボウズ製品のURLの指定方法は以下の通りとなります。
5354

54-
* サイボウズ(R) Office(R) 8 または 9
55+
* サイボウズ(R) Office(R)
5556
* 例） `http://example.com/scripts/cbag/ag.exe`
5657
* 例） `http://example.com/cgi-bin/cbag/ag.cgi`
5758
* サイボウズ(R) ガルーン(R)

0 commit comments

Comments
 (0)