TweetThumbnail.searchSimilarImageMenuItem を searchImageGoogleMenuItem に名前変更

diff --git a/OpenTween/TweetThumbnail.Designer.cs b/OpenTween/TweetThumbnail.Designer.cs
index a6d7d4f..2cb47cd 100644 (file)
--- a/OpenTween/TweetThumbnail.Designer.cs
+++ b/OpenTween/TweetThumbnail.Designer.cs
@@ -34,7 +34,7 @@
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.panelPictureBox = new System.Windows.Forms.Panel();
             this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.searchSimilarImageMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.searchImageGoogleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.searchImageSauceNaoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.contextMenuStrip.SuspendLayout();
             this.SuspendLayout();
@@ -58,17 +58,17 @@
             // 
             resources.ApplyResources(this.contextMenuStrip, "contextMenuStrip");
             this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.searchSimilarImageMenuItem,
+            this.searchImageGoogleMenuItem,
             this.searchImageSauceNaoMenuItem});
             this.contextMenuStrip.Name = "contextMenuStrip";
             this.toolTip.SetToolTip(this.contextMenuStrip, resources.GetString("contextMenuStrip.ToolTip"));
             this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
             // 
-            // searchSimilarImageMenuItem
+            // searchImageGoogleMenuItem
             // 
-            resources.ApplyResources(this.searchSimilarImageMenuItem, "searchSimilarImageMenuItem");
-            this.searchSimilarImageMenuItem.Name = "searchSimilarImageMenuItem";
-            this.searchSimilarImageMenuItem.Click += new System.EventHandler(this.searchSimilarImageMenuItem_Click);
+            resources.ApplyResources(this.searchImageGoogleMenuItem, "searchImageGoogleMenuItem");
+            this.searchImageGoogleMenuItem.Name = "searchImageGoogleMenuItem";
+            this.searchImageGoogleMenuItem.Click += new System.EventHandler(this.searchSimilarImageMenuItem_Click);
             // 
             // searchImageSauceNaoMenuItem
             // 
@@ -95,7 +95,7 @@
         protected internal System.Windows.Forms.ToolTip toolTip;
         protected internal System.Windows.Forms.Panel panelPictureBox;
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
-        private System.Windows.Forms.ToolStripMenuItem searchSimilarImageMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem searchImageGoogleMenuItem;
         private System.Windows.Forms.ToolStripMenuItem searchImageSauceNaoMenuItem;
     }
 }

diff --git a/OpenTween/TweetThumbnail.cs b/OpenTween/TweetThumbnail.cs
index 0661780..171b3b9 100644 (file)
--- a/OpenTween/TweetThumbnail.cs
+++ b/OpenTween/TweetThumbnail.cs
@@ -109,7 +109,7 @@ namespace OpenTween
             await Task.WhenAll(loadTasks).ConfigureAwait(false);
         }
 
-        private string GetImageSearchUri(string image_uri)
+        private string GetImageSearchUriGoogle(string image_uri)
         {
             return @"https://www.google.com/searchbyimage?image_url=" + Uri.EscapeDataString(image_uri);
         }
@@ -242,22 +242,22 @@ namespace OpenTween
             var searchTargetUri = thumb.FullSizeImageUrl ?? thumb.ThumbnailUrl ?? null;
             if (searchTargetUri != null)
             {
-                this.searchSimilarImageMenuItem.Enabled = true;
-                this.searchSimilarImageMenuItem.Tag = searchTargetUri;
+                this.searchImageGoogleMenuItem.Enabled = true;
+                this.searchImageGoogleMenuItem.Tag = searchTargetUri;
                 this.searchImageSauceNaoMenuItem.Enabled = true;
                 this.searchImageSauceNaoMenuItem.Tag = searchTargetUri;
             }
             else
             {
-                this.searchSimilarImageMenuItem.Enabled = false;
+                this.searchImageGoogleMenuItem.Enabled = false;
                 this.searchImageSauceNaoMenuItem.Enabled = false;
             }
         }
 
         private void searchSimilarImageMenuItem_Click(object sender, EventArgs e)
         {
-            var searchTargetUri = (string)this.searchSimilarImageMenuItem.Tag;
-            var searchUri = this.GetImageSearchUri(searchTargetUri);
+            var searchTargetUri = (string)this.searchImageGoogleMenuItem.Tag;
+            var searchUri = this.GetImageSearchUriGoogle(searchTargetUri);
 
             this.ThumbnailImageSearchClick?.Invoke(this, new ThumbnailImageSearchEventArgs(searchUri));
         }

diff --git a/OpenTween/TweetThumbnail.en.resx b/OpenTween/TweetThumbnail.en.resx
index 9becb31..ee9003d 100644 (file)
--- a/OpenTween/TweetThumbnail.en.resx
+++ b/OpenTween/TweetThumbnail.en.resx
@@ -124,10 +124,10 @@
     <value />
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="searchSimilarImageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="searchImageGoogleMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>254, 22</value>
   </data>
-  <data name="searchSimilarImageMenuItem.Text" xml:space="preserve">
+  <data name="searchImageGoogleMenuItem.Text" xml:space="preserve">
     <value>Search similar images (Google)</value>
   </data>
   <data name="searchImageSauceNaoMenuItem.Size" type="System.Drawing.Size, System.Drawing">

diff --git a/OpenTween/TweetThumbnail.resx b/OpenTween/TweetThumbnail.resx
index 225afbe..81fd040 100644 (file)
--- a/OpenTween/TweetThumbnail.resx
+++ b/OpenTween/TweetThumbnail.resx
@@ -136,7 +136,7 @@
   <data name="searchImageSauceNaoMenuItem.Text" xml:space="preserve">
     <value>類似画像を検索 (SauceNAO)</value>
   </data>
-  <data name="searchSimilarImageMenuItem.Text" xml:space="preserve">
+  <data name="searchImageGoogleMenuItem.Text" xml:space="preserve">
     <value>類似画像を検索 (Google)</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
@@ -198,7 +198,7 @@
   <data name="panelPictureBox.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="&gt;&gt;searchSimilarImageMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;searchImageGoogleMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="panelPictureBox.Location" type="System.Drawing.Point, System.Drawing">
@@ -210,14 +210,14 @@
   <data name="scrollBar.Location" type="System.Drawing.Point, System.Drawing">
     <value>143, 0</value>
   </data>
-  <data name="searchSimilarImageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="searchImageGoogleMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>223, 22</value>
   </data>
   <data name="scrollBar.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
   </data>
-  <data name="&gt;&gt;searchSimilarImageMenuItem.Name" xml:space="preserve">
-    <value>searchSimilarImageMenuItem</value>
+  <data name="&gt;&gt;searchImageGoogleMenuItem.Name" xml:space="preserve">
+    <value>searchImageGoogleMenuItem</value>
   </data>
   <data name="&gt;&gt;toolTip.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>