リビジョン | 6ad4a7c61bd9058b0fd1a868a1f11dcfb24cfe79 (tree) |
---|---|
日時 | 2014-04-20 02:04:45 |
作者 | Kimura Youichi <kim.upsilon@bucy...> |
コミッター | Kimura Youichi |
設定画面から「FoursquareのURLからプレビューを表示する」の項目を削除
ベニュー情報の取得が非同期に行えるようになり動作に支障を来す恐れが無くなったため
@@ -42,15 +42,9 @@ namespace OpenTween.Thumbnail.Services | ||
42 | 42 | { |
43 | 43 | public FoursquareCheckinTest() |
44 | 44 | { |
45 | - this.SettingsSetup(); | |
46 | 45 | this.MyCommonSetup(); |
47 | 46 | } |
48 | 47 | |
49 | - public void SettingsSetup() | |
50 | - { | |
51 | - AppendSettingDialog.Instance.IsPreviewFoursquare = true; | |
52 | - } | |
53 | - | |
54 | 48 | public void MyCommonSetup() |
55 | 49 | { |
56 | 50 | var mockAssembly = Substitute.For<_Assembly>(); |
@@ -155,32 +149,6 @@ namespace OpenTween.Thumbnail.Services | ||
155 | 149 | } |
156 | 150 | |
157 | 151 | [Fact] |
158 | - public async Task GetThumbnailInfoAsync_DisabledTest() | |
159 | - { | |
160 | - var handler = new HttpMessageHandlerMock(); | |
161 | - var service = new FoursquareCheckin(new HttpClient(handler)); | |
162 | - | |
163 | - handler.Queue.Enqueue(async x => | |
164 | - { | |
165 | - // このリクエストは実行されないはず | |
166 | - Assert.True(false); | |
167 | - return new HttpResponseMessage(HttpStatusCode.NotFound); | |
168 | - }); | |
169 | - | |
170 | - var post = new PostClass | |
171 | - { | |
172 | - PostGeo = new PostClass.StatusGeo { }, | |
173 | - }; | |
174 | - | |
175 | - // 設定により無効化されている場合は何もしない | |
176 | - AppendSettingDialog.Instance.IsPreviewFoursquare = false; | |
177 | - | |
178 | - var thumb = await service.GetThumbnailInfoAsync( | |
179 | - "https://foursquare.com/checkin/hogehoge/xxxxxxxx", | |
180 | - post, CancellationToken.None); | |
181 | - } | |
182 | - | |
183 | - [Fact] | |
184 | 152 | public void ParseInLocation_Test() |
185 | 153 | { |
186 | 154 | var json = @"{ |
@@ -56,7 +56,6 @@ namespace OpenTween | ||
56 | 56 | |
57 | 57 | public bool EnableImgAzyobuziNet { get; set; } |
58 | 58 | public bool ImgAzyobuziNetDisabledInDM { get; set; } |
59 | - public bool IsPreviewFoursquare; | |
60 | 59 | public MapProvider MapThumbnailProvider; |
61 | 60 | public int MapThumbnailHeight; |
62 | 61 | public int MapThumbnailWidth; |
@@ -475,7 +474,6 @@ namespace OpenTween | ||
475 | 474 | this.HideDuplicatedRetweets = this.TweetPrvPanel.HideDuplicatedRetweetsCheck.Checked; |
476 | 475 | this.EnableImgAzyobuziNet = this.CooperatePanel.EnableImgAzyobuziNetCheckBox.Checked; |
477 | 476 | this.ImgAzyobuziNetDisabledInDM = this.CooperatePanel.ImgAzyobuziNetDisabledInDMCheckBox.Checked; |
478 | - this.IsPreviewFoursquare = this.CooperatePanel.IsPreviewFoursquareCheckBox.Checked; | |
479 | 477 | this.MapThumbnailProvider = (MapProvider)this.CooperatePanel.MapThumbnailProviderComboBox.SelectedIndex; |
480 | 478 | this.MapThumbnailHeight = int.Parse(this.CooperatePanel.MapThumbnailHeightTextBox.Text); |
481 | 479 | this.MapThumbnailWidth = int.Parse(this.CooperatePanel.MapThumbnailWidthTextBox.Text); |
@@ -856,7 +854,6 @@ namespace OpenTween | ||
856 | 854 | this.TweetPrvPanel.HideDuplicatedRetweetsCheck.Checked = this.HideDuplicatedRetweets; |
857 | 855 | this.CooperatePanel.EnableImgAzyobuziNetCheckBox.Checked = this.EnableImgAzyobuziNet; |
858 | 856 | this.CooperatePanel.ImgAzyobuziNetDisabledInDMCheckBox.Checked = this.ImgAzyobuziNetDisabledInDM; |
859 | - this.CooperatePanel.IsPreviewFoursquareCheckBox.Checked = this.IsPreviewFoursquare; | |
860 | 857 | this.CooperatePanel.MapThumbnailProviderComboBox.SelectedIndex = (int)this.MapThumbnailProvider; |
861 | 858 | this.CooperatePanel.MapThumbnailHeightTextBox.Text = this.MapThumbnailHeight.ToString(); |
862 | 859 | this.CooperatePanel.MapThumbnailWidthTextBox.Text = this.MapThumbnailWidth.ToString(); |
@@ -10,6 +10,9 @@ | ||
10 | 10 | * CHG: 使用する.NET Frameworkのバージョンが 4.0 から 4.5.1 に変更されました |
11 | 11 | * CHG: 画像ファイルをD&Dした際の動作を変更しました |
12 | 12 | - 投稿先がD&Dしたファイルに対応していない場合、勝手に投稿先を切り替えず、エラーダイアログを表示するだけにします |
13 | + * CHG: 設定画面から「FoursquareのURLからプレビューを表示する」の項目を削除しました | |
14 | + - ベニュー情報の取得が非同期に行えるようになり動作に支障を来す恐れが無くなったため | |
15 | + - 以前の設定に関わらずチェックインURLが含まれているツイートはサムネイルに地図が表示されるようになります | |
13 | 16 | * FIX: PublicSearchタブでの再検索時に、特定の条件下でエラーが発生する問題を修正 (thx @Lolitapple!) |
14 | 17 | * FIX: FoursquareのチェックインURLのサムネイル表示が動作しなくなっていたのを修正 |
15 | 18 |
@@ -29,7 +29,6 @@ | ||
29 | 29 | private void InitializeComponent() |
30 | 30 | { |
31 | 31 | System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CooperatePanel)); |
32 | - this.IsPreviewFoursquareCheckBox = new System.Windows.Forms.CheckBox(); | |
33 | 32 | this.MapThumbnailGroupBox = new System.Windows.Forms.GroupBox(); |
34 | 33 | this.MapThumbnailProviderComboBox = new System.Windows.Forms.ComboBox(); |
35 | 34 | this.label48 = new System.Windows.Forms.Label(); |
@@ -49,12 +48,6 @@ | ||
49 | 48 | this.MapThumbnailGroupBox.SuspendLayout(); |
50 | 49 | this.SuspendLayout(); |
51 | 50 | // |
52 | - // IsPreviewFoursquareCheckBox | |
53 | - // | |
54 | - resources.ApplyResources(this.IsPreviewFoursquareCheckBox, "IsPreviewFoursquareCheckBox"); | |
55 | - this.IsPreviewFoursquareCheckBox.Name = "IsPreviewFoursquareCheckBox"; | |
56 | - this.IsPreviewFoursquareCheckBox.UseVisualStyleBackColor = true; | |
57 | - // | |
58 | 51 | // MapThumbnailGroupBox |
59 | 52 | // |
60 | 53 | this.MapThumbnailGroupBox.Controls.Add(this.MapThumbnailProviderComboBox); |
@@ -287,7 +280,6 @@ | ||
287 | 280 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; |
288 | 281 | this.Controls.Add(this.ImgAzyobuziNetDisabledInDMCheckBox); |
289 | 282 | this.Controls.Add(this.EnableImgAzyobuziNetCheckBox); |
290 | - this.Controls.Add(this.IsPreviewFoursquareCheckBox); | |
291 | 283 | this.Controls.Add(this.MapThumbnailGroupBox); |
292 | 284 | this.Controls.Add(this.Label39); |
293 | 285 | this.Controls.Add(this.UserAppointUrlText); |
@@ -304,7 +296,6 @@ | ||
304 | 296 | |
305 | 297 | #endregion |
306 | 298 | |
307 | - internal System.Windows.Forms.CheckBox IsPreviewFoursquareCheckBox; | |
308 | 299 | internal System.Windows.Forms.GroupBox MapThumbnailGroupBox; |
309 | 300 | private System.Windows.Forms.Label label48; |
310 | 301 | internal System.Windows.Forms.Label Label42; |
@@ -118,12 +118,6 @@ | ||
118 | 118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | 119 | </resheader> |
120 | 120 | <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> |
121 | - <data name="IsPreviewFoursquareCheckBox.Size" type="System.Drawing.Size, System.Drawing"> | |
122 | - <value>239, 16</value> | |
123 | - </data> | |
124 | - <data name="IsPreviewFoursquareCheckBox.Text" xml:space="preserve"> | |
125 | - <value>Get map thumbnails from Foursquare urls.</value> | |
126 | - </data> | |
127 | 121 | <data name="label48.Size" type="System.Drawing.Size, System.Drawing"> |
128 | 122 | <value>72, 12</value> |
129 | 123 | </data> |
@@ -118,38 +118,8 @@ | ||
118 | 118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | 119 | </resheader> |
120 | 120 | <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> |
121 | - <data name="IsPreviewFoursquareCheckBox.AutoSize" type="System.Boolean, mscorlib"> | |
122 | - <value>True</value> | |
123 | - </data> | |
124 | 121 | <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> |
125 | - <data name="IsPreviewFoursquareCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> | |
126 | - <value>NoControl</value> | |
127 | - </data> | |
128 | 122 | <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> |
129 | - <data name="IsPreviewFoursquareCheckBox.Location" type="System.Drawing.Point, System.Drawing"> | |
130 | - <value>23, 181</value> | |
131 | - </data> | |
132 | - <data name="IsPreviewFoursquareCheckBox.Size" type="System.Drawing.Size, System.Drawing"> | |
133 | - <value>327, 16</value> | |
134 | - </data> | |
135 | - <data name="IsPreviewFoursquareCheckBox.TabIndex" type="System.Int32, mscorlib"> | |
136 | - <value>7</value> | |
137 | - </data> | |
138 | - <data name="IsPreviewFoursquareCheckBox.Text" xml:space="preserve"> | |
139 | - <value>FoursquareのURLからプレビューを表示する(非常に重くなります)</value> | |
140 | - </data> | |
141 | - <data name=">>IsPreviewFoursquareCheckBox.Name" xml:space="preserve"> | |
142 | - <value>IsPreviewFoursquareCheckBox</value> | |
143 | - </data> | |
144 | - <data name=">>IsPreviewFoursquareCheckBox.Type" xml:space="preserve"> | |
145 | - <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | |
146 | - </data> | |
147 | - <data name=">>IsPreviewFoursquareCheckBox.Parent" xml:space="preserve"> | |
148 | - <value>$this</value> | |
149 | - </data> | |
150 | - <data name=">>IsPreviewFoursquareCheckBox.ZOrder" xml:space="preserve"> | |
151 | - <value>2</value> | |
152 | - </data> | |
153 | 123 | <data name="MapThumbnailProviderComboBox.Items" xml:space="preserve"> |
154 | 124 | <value>OpenStreetMap</value> |
155 | 125 | </data> |
@@ -370,7 +340,7 @@ | ||
370 | 340 | <value>473, 80</value> |
371 | 341 | </data> |
372 | 342 | <data name="MapThumbnailGroupBox.TabIndex" type="System.Int32, mscorlib"> |
373 | - <value>8</value> | |
343 | + <value>7</value> | |
374 | 344 | </data> |
375 | 345 | <data name="MapThumbnailGroupBox.Text" xml:space="preserve"> |
376 | 346 | <value>地図サムネイル</value> |
@@ -385,7 +355,7 @@ | ||
385 | 355 | <value>$this</value> |
386 | 356 | </data> |
387 | 357 | <data name=">>MapThumbnailGroupBox.ZOrder" xml:space="preserve"> |
388 | - <value>3</value> | |
358 | + <value>2</value> | |
389 | 359 | </data> |
390 | 360 | <data name="Label39.AutoSize" type="System.Boolean, mscorlib"> |
391 | 361 | <value>True</value> |
@@ -415,7 +385,7 @@ | ||
415 | 385 | <value>$this</value> |
416 | 386 | </data> |
417 | 387 | <data name=">>Label39.ZOrder" xml:space="preserve"> |
418 | - <value>4</value> | |
388 | + <value>3</value> | |
419 | 389 | </data> |
420 | 390 | <data name="UserAppointUrlText.Location" type="System.Drawing.Point, System.Drawing"> |
421 | 391 | <value>218, 102</value> |
@@ -436,7 +406,7 @@ | ||
436 | 406 | <value>$this</value> |
437 | 407 | </data> |
438 | 408 | <data name=">>UserAppointUrlText.ZOrder" xml:space="preserve"> |
439 | - <value>5</value> | |
409 | + <value>4</value> | |
440 | 410 | </data> |
441 | 411 | <data name="ComboBoxTranslateLanguage.Items" xml:space="preserve"> |
442 | 412 | <value>Afrikaans</value> |
@@ -829,7 +799,7 @@ | ||
829 | 799 | <value>$this</value> |
830 | 800 | </data> |
831 | 801 | <data name=">>ComboBoxTranslateLanguage.ZOrder" xml:space="preserve"> |
832 | - <value>6</value> | |
802 | + <value>5</value> | |
833 | 803 | </data> |
834 | 804 | <data name="Label29.AutoSize" type="System.Boolean, mscorlib"> |
835 | 805 | <value>True</value> |
@@ -859,7 +829,7 @@ | ||
859 | 829 | <value>$this</value> |
860 | 830 | </data> |
861 | 831 | <data name=">>Label29.ZOrder" xml:space="preserve"> |
862 | - <value>7</value> | |
832 | + <value>6</value> | |
863 | 833 | </data> |
864 | 834 | <data name="CheckNicoms.AutoSize" type="System.Boolean, mscorlib"> |
865 | 835 | <value>True</value> |
@@ -889,7 +859,7 @@ | ||
889 | 859 | <value>$this</value> |
890 | 860 | </data> |
891 | 861 | <data name=">>CheckNicoms.ZOrder" xml:space="preserve"> |
892 | - <value>8</value> | |
862 | + <value>7</value> | |
893 | 863 | </data> |
894 | 864 | <data name="EnableImgAzyobuziNetCheckBox.AutoSize" type="System.Boolean, mscorlib"> |
895 | 865 | <value>True</value> |
@@ -205,7 +205,6 @@ namespace OpenTween | ||
205 | 205 | public bool HideDuplicatedRetweets = false; |
206 | 206 | public bool EnableImgAzyobuziNet = true; |
207 | 207 | public bool ImgAzyobuziNetDisabledInDM = true; |
208 | - public bool IsPreviewFoursquare = false; | |
209 | 208 | public int MapThumbnailHeight = 200; |
210 | 209 | public int MapThumbnailWidth = 200; |
211 | 210 | public int MapThumbnailZoom = 15; |
@@ -53,9 +53,6 @@ namespace OpenTween.Thumbnail.Services | ||
53 | 53 | |
54 | 54 | public override async Task<ThumbnailInfo> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token) |
55 | 55 | { |
56 | - if (!AppendSettingDialog.Instance.IsPreviewFoursquare) | |
57 | - return null; | |
58 | - | |
59 | 56 | // ツイートに位置情報が付与されている場合は何もしない |
60 | 57 | if (post.PostGeo.Lat != 0 || post.PostGeo.Lng != 0) |
61 | 58 | return null; |
@@ -921,7 +921,6 @@ namespace OpenTween | ||
921 | 921 | |
922 | 922 | SettingDialog.EnableImgAzyobuziNet = _cfgCommon.EnableImgAzyobuziNet; |
923 | 923 | SettingDialog.ImgAzyobuziNetDisabledInDM = _cfgCommon.ImgAzyobuziNetDisabledInDM; |
924 | - SettingDialog.IsPreviewFoursquare = _cfgCommon.IsPreviewFoursquare; | |
925 | 924 | SettingDialog.MapThumbnailProvider = _cfgCommon.MapThumbnailProvider; |
926 | 925 | SettingDialog.MapThumbnailHeight = _cfgCommon.MapThumbnailHeight; |
927 | 926 | SettingDialog.MapThumbnailWidth = _cfgCommon.MapThumbnailWidth; |
@@ -7859,7 +7858,6 @@ namespace OpenTween | ||
7859 | 7858 | _cfgCommon.HideDuplicatedRetweets = SettingDialog.HideDuplicatedRetweets; |
7860 | 7859 | _cfgCommon.EnableImgAzyobuziNet = SettingDialog.EnableImgAzyobuziNet; |
7861 | 7860 | _cfgCommon.ImgAzyobuziNetDisabledInDM = SettingDialog.ImgAzyobuziNetDisabledInDM; |
7862 | - _cfgCommon.IsPreviewFoursquare = SettingDialog.IsPreviewFoursquare; | |
7863 | 7861 | _cfgCommon.MapThumbnailProvider = SettingDialog.MapThumbnailProvider; |
7864 | 7862 | _cfgCommon.MapThumbnailHeight = SettingDialog.MapThumbnailHeight; |
7865 | 7863 | _cfgCommon.MapThumbnailWidth = SettingDialog.MapThumbnailWidth; |