ContextMenuPostMode以下のメニュー項目の名前を変更

同一のメニュー項目を画面上部のメニューバーにも追加するため、区別のために 機能名+PullDownMenuItem の形式に名前を変更

diff --git a/OpenTween/Tween.Designer.cs b/OpenTween/Tween.Designer.cs
index 8307d3e..21b5f92 100644 (file)
--- a/OpenTween/Tween.Designer.cs
+++ b/OpenTween/Tween.Designer.cs
@@ -24,17 +24,17 @@
             this.toolStripApiGauge = new OpenTween.ToolStripAPIGauge();
             this.HashStripSplitButton = new System.Windows.Forms.ToolStripSplitButton();
             this.ContextMenuPostMode = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.ToolStripMenuItemUrlMultibyteSplit = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripMenuItemPreventSmsCommand = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripMenuItemUrlAutoShorten = new System.Windows.Forms.ToolStripMenuItem();
-            this.IdeographicSpaceToSpaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MultiLineMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripFocusLockMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.UrlMultibyteSplitPullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.PreventSmsCommandPullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.UrlAutoShortenPullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.IdeographicSpaceToSpacePullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.MultiLinePullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.FocusLockPullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripSeparator35 = new System.Windows.Forms.ToolStripSeparator();
-            this.ImageSelectMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ImageSelectPullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-            this.HashToggleMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HashManageMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.HashTogglePullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.HashManagePullDownMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.SplitContainer1 = new OpenTween.OTSplitContainer();
             this.TimelinePanel = new System.Windows.Forms.Panel();
             this.ListTab = new System.Windows.Forms.TabControl();
@@ -358,94 +358,94 @@
             // ContextMenuPostMode
             // 
             this.ContextMenuPostMode.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ToolStripMenuItemUrlMultibyteSplit,
-            this.ToolStripMenuItemPreventSmsCommand,
-            this.ToolStripMenuItemUrlAutoShorten,
-            this.IdeographicSpaceToSpaceToolStripMenuItem,
-            this.MultiLineMenuItem,
-            this.ToolStripFocusLockMenuItem,
+            this.UrlMultibyteSplitPullDownMenuItem,
+            this.PreventSmsCommandPullDownMenuItem,
+            this.UrlAutoShortenPullDownMenuItem,
+            this.IdeographicSpaceToSpacePullDownMenuItem,
+            this.MultiLinePullDownMenuItem,
+            this.FocusLockPullDownMenuItem,
             this.ToolStripSeparator35,
-            this.ImageSelectMenuItem,
+            this.ImageSelectPullDownMenuItem,
             this.ToolStripSeparator8,
-            this.HashToggleMenuItem,
-            this.HashManageMenuItem});
+            this.HashTogglePullDownMenuItem,
+            this.HashManagePullDownMenuItem});
             this.ContextMenuPostMode.Name = "ContextMenuStripPostMode";
             this.ContextMenuPostMode.OwnerItem = this.HashStripSplitButton;
             resources.ApplyResources(this.ContextMenuPostMode, "ContextMenuPostMode");
             this.ContextMenuPostMode.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuPostMode_Opening);
             // 
-            // ToolStripMenuItemUrlMultibyteSplit
+            // UrlMultibyteSplitPullDownMenuItem
             // 
-            this.ToolStripMenuItemUrlMultibyteSplit.CheckOnClick = true;
-            this.ToolStripMenuItemUrlMultibyteSplit.Name = "ToolStripMenuItemUrlMultibyteSplit";
-            resources.ApplyResources(this.ToolStripMenuItemUrlMultibyteSplit, "ToolStripMenuItemUrlMultibyteSplit");
+            this.UrlMultibyteSplitPullDownMenuItem.CheckOnClick = true;
+            this.UrlMultibyteSplitPullDownMenuItem.Name = "UrlMultibyteSplitPullDownMenuItem";
+            resources.ApplyResources(this.UrlMultibyteSplitPullDownMenuItem, "UrlMultibyteSplitPullDownMenuItem");
             // 
-            // ToolStripMenuItemPreventSmsCommand
+            // PreventSmsCommandPullDownMenuItem
             // 
-            this.ToolStripMenuItemPreventSmsCommand.Checked = true;
-            this.ToolStripMenuItemPreventSmsCommand.CheckOnClick = true;
-            this.ToolStripMenuItemPreventSmsCommand.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.ToolStripMenuItemPreventSmsCommand.Name = "ToolStripMenuItemPreventSmsCommand";
-            resources.ApplyResources(this.ToolStripMenuItemPreventSmsCommand, "ToolStripMenuItemPreventSmsCommand");
+            this.PreventSmsCommandPullDownMenuItem.Checked = true;
+            this.PreventSmsCommandPullDownMenuItem.CheckOnClick = true;
+            this.PreventSmsCommandPullDownMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.PreventSmsCommandPullDownMenuItem.Name = "PreventSmsCommandPullDownMenuItem";
+            resources.ApplyResources(this.PreventSmsCommandPullDownMenuItem, "PreventSmsCommandPullDownMenuItem");
             // 
-            // ToolStripMenuItemUrlAutoShorten
+            // UrlAutoShortenPullDownMenuItem
             // 
-            this.ToolStripMenuItemUrlAutoShorten.CheckOnClick = true;
-            this.ToolStripMenuItemUrlAutoShorten.Name = "ToolStripMenuItemUrlAutoShorten";
-            resources.ApplyResources(this.ToolStripMenuItemUrlAutoShorten, "ToolStripMenuItemUrlAutoShorten");
-            this.ToolStripMenuItemUrlAutoShorten.CheckedChanged += new System.EventHandler(this.ToolStripMenuItemUrlAutoShorten_CheckedChanged);
+            this.UrlAutoShortenPullDownMenuItem.CheckOnClick = true;
+            this.UrlAutoShortenPullDownMenuItem.Name = "UrlAutoShortenPullDownMenuItem";
+            resources.ApplyResources(this.UrlAutoShortenPullDownMenuItem, "UrlAutoShortenPullDownMenuItem");
+            this.UrlAutoShortenPullDownMenuItem.CheckedChanged += new System.EventHandler(this.UrlAutoShortenMenuItem_CheckedChanged);
             // 
-            // IdeographicSpaceToSpaceToolStripMenuItem
+            // IdeographicSpaceToSpacePullDownMenuItem
             // 
-            this.IdeographicSpaceToSpaceToolStripMenuItem.Checked = true;
-            this.IdeographicSpaceToSpaceToolStripMenuItem.CheckOnClick = true;
-            this.IdeographicSpaceToSpaceToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.IdeographicSpaceToSpaceToolStripMenuItem.Name = "IdeographicSpaceToSpaceToolStripMenuItem";
-            resources.ApplyResources(this.IdeographicSpaceToSpaceToolStripMenuItem, "IdeographicSpaceToSpaceToolStripMenuItem");
-            this.IdeographicSpaceToSpaceToolStripMenuItem.Click += new System.EventHandler(this.IdeographicSpaceToSpaceToolStripMenuItem_Click);
+            this.IdeographicSpaceToSpacePullDownMenuItem.Checked = true;
+            this.IdeographicSpaceToSpacePullDownMenuItem.CheckOnClick = true;
+            this.IdeographicSpaceToSpacePullDownMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.IdeographicSpaceToSpacePullDownMenuItem.Name = "IdeographicSpaceToSpacePullDownMenuItem";
+            resources.ApplyResources(this.IdeographicSpaceToSpacePullDownMenuItem, "IdeographicSpaceToSpacePullDownMenuItem");
+            this.IdeographicSpaceToSpacePullDownMenuItem.Click += new System.EventHandler(this.IdeographicSpaceToSpaceMenuItem_Click);
             // 
-            // MultiLineMenuItem
+            // MultiLinePullDownMenuItem
             // 
-            this.MultiLineMenuItem.CheckOnClick = true;
-            this.MultiLineMenuItem.Name = "MultiLineMenuItem";
-            resources.ApplyResources(this.MultiLineMenuItem, "MultiLineMenuItem");
-            this.MultiLineMenuItem.Click += new System.EventHandler(this.MultiLineMenuItem_Click);
+            this.MultiLinePullDownMenuItem.CheckOnClick = true;
+            this.MultiLinePullDownMenuItem.Name = "MultiLinePullDownMenuItem";
+            resources.ApplyResources(this.MultiLinePullDownMenuItem, "MultiLinePullDownMenuItem");
+            this.MultiLinePullDownMenuItem.Click += new System.EventHandler(this.MultiLineMenuItem_Click);
             // 
-            // ToolStripFocusLockMenuItem
+            // FocusLockPullDownMenuItem
             // 
-            this.ToolStripFocusLockMenuItem.CheckOnClick = true;
-            this.ToolStripFocusLockMenuItem.Name = "ToolStripFocusLockMenuItem";
-            resources.ApplyResources(this.ToolStripFocusLockMenuItem, "ToolStripFocusLockMenuItem");
-            this.ToolStripFocusLockMenuItem.CheckedChanged += new System.EventHandler(this.ToolStripFocusLockMenuItem_CheckedChanged);
+            this.FocusLockPullDownMenuItem.CheckOnClick = true;
+            this.FocusLockPullDownMenuItem.Name = "FocusLockPullDownMenuItem";
+            resources.ApplyResources(this.FocusLockPullDownMenuItem, "FocusLockPullDownMenuItem");
+            this.FocusLockPullDownMenuItem.CheckedChanged += new System.EventHandler(this.FocusLockMenuItem_CheckedChanged);
             // 
             // ToolStripSeparator35
             // 
             this.ToolStripSeparator35.Name = "ToolStripSeparator35";
             resources.ApplyResources(this.ToolStripSeparator35, "ToolStripSeparator35");
             // 
-            // ImageSelectMenuItem
+            // ImageSelectPullDownMenuItem
             // 
-            this.ImageSelectMenuItem.Name = "ImageSelectMenuItem";
-            resources.ApplyResources(this.ImageSelectMenuItem, "ImageSelectMenuItem");
-            this.ImageSelectMenuItem.Click += new System.EventHandler(this.ImageSelectMenuItem_Click);
+            this.ImageSelectPullDownMenuItem.Name = "ImageSelectPullDownMenuItem";
+            resources.ApplyResources(this.ImageSelectPullDownMenuItem, "ImageSelectPullDownMenuItem");
+            this.ImageSelectPullDownMenuItem.Click += new System.EventHandler(this.ImageSelectMenuItem_Click);
             // 
             // ToolStripSeparator8
             // 
             this.ToolStripSeparator8.Name = "ToolStripSeparator8";
             resources.ApplyResources(this.ToolStripSeparator8, "ToolStripSeparator8");
             // 
-            // HashToggleMenuItem
+            // HashTogglePullDownMenuItem
             // 
-            this.HashToggleMenuItem.CheckOnClick = true;
-            this.HashToggleMenuItem.Name = "HashToggleMenuItem";
-            resources.ApplyResources(this.HashToggleMenuItem, "HashToggleMenuItem");
-            this.HashToggleMenuItem.Click += new System.EventHandler(this.HashToggleMenuItem_Click);
+            this.HashTogglePullDownMenuItem.CheckOnClick = true;
+            this.HashTogglePullDownMenuItem.Name = "HashTogglePullDownMenuItem";
+            resources.ApplyResources(this.HashTogglePullDownMenuItem, "HashTogglePullDownMenuItem");
+            this.HashTogglePullDownMenuItem.Click += new System.EventHandler(this.HashToggleMenuItem_Click);
             // 
-            // HashManageMenuItem
+            // HashManagePullDownMenuItem
             // 
-            this.HashManageMenuItem.Name = "HashManageMenuItem";
-            resources.ApplyResources(this.HashManageMenuItem, "HashManageMenuItem");
-            this.HashManageMenuItem.Click += new System.EventHandler(this.HashManageMenuItem_Click);
+            this.HashManagePullDownMenuItem.Name = "HashManagePullDownMenuItem";
+            resources.ApplyResources(this.HashManagePullDownMenuItem, "HashManagePullDownMenuItem");
+            this.HashManagePullDownMenuItem.Click += new System.EventHandler(this.HashManageMenuItem_Click);
             // 
             // SplitContainer1
             // 
@@ -2123,17 +2123,17 @@
         internal OpenTweenCustomControl.ToolStripLabelHistory StatusLabel;
         internal System.Windows.Forms.ToolStripSplitButton HashStripSplitButton;
         internal System.Windows.Forms.ContextMenuStrip ContextMenuPostMode;
-        internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemUrlMultibyteSplit;
-        internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemPreventSmsCommand;
-        internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemUrlAutoShorten;
-        internal System.Windows.Forms.ToolStripMenuItem IdeographicSpaceToSpaceToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem MultiLineMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ToolStripFocusLockMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem UrlMultibyteSplitPullDownMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem PreventSmsCommandPullDownMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem UrlAutoShortenPullDownMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem IdeographicSpaceToSpacePullDownMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem MultiLinePullDownMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem FocusLockPullDownMenuItem;
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator35;
-        internal System.Windows.Forms.ToolStripMenuItem ImageSelectMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem ImageSelectPullDownMenuItem;
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator8;
-        internal System.Windows.Forms.ToolStripMenuItem HashToggleMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem HashManageMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem HashTogglePullDownMenuItem;
+        internal System.Windows.Forms.ToolStripMenuItem HashManagePullDownMenuItem;
         internal OTSplitContainer SplitContainer1;
         internal System.Windows.Forms.Panel TimelinePanel;
         internal System.Windows.Forms.TabControl ListTab;

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 104a96b..71d439a 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -918,8 +918,8 @@ namespace OpenTween
             this.PlaySoundMenuItem.Checked = SettingManager.Common.PlaySound;
             this.PlaySoundFileMenuItem.Checked = SettingManager.Common.PlaySound;
 
-            this.IdeographicSpaceToSpaceToolStripMenuItem.Checked = SettingManager.Common.WideSpaceConvert;
-            this.ToolStripFocusLockMenuItem.Checked = SettingManager.Common.FocusLockToStatusText;
+            this.IdeographicSpaceToSpacePullDownMenuItem.Checked = SettingManager.Common.WideSpaceConvert;
+            this.FocusLockPullDownMenuItem.Checked = SettingManager.Common.FocusLockToStatusText;
 
             //ウィンドウ設定
             this.ClientSize = ScaleBy(configScaleFactor, SettingManager.Local.FormSize);
@@ -959,7 +959,7 @@ namespace OpenTween
             {
                 _mySpDis3 = ScaleBy(configScaleFactor.Width, SettingManager.Local.PreviewDistance);
             }
-            MultiLineMenuItem.Checked = SettingManager.Local.StatusMultiline;
+            MultiLinePullDownMenuItem.Checked = SettingManager.Local.StatusMultiline;
             //this.Tween_ClientSizeChanged(this, null);
             this.PlaySoundMenuItem.Checked = SettingManager.Common.PlaySound;
             this.PlaySoundFileMenuItem.Checked = SettingManager.Common.PlaySound;
@@ -2149,7 +2149,7 @@ namespace OpenTween
             StatusText.Text = "";
             _history.Add(new PostingStatus());
             _hisIdx = _history.Count - 1;
-            if (!ToolStripFocusLockMenuItem.Checked)
+            if (!FocusLockPullDownMenuItem.Checked)
                 ((Control)ListTab.SelectedTab.Tag).Focus();
             urlUndoBuffer = null;
             UrlUndoToolStripMenuItem.Enabled = false;  //Undoをできないように設定
@@ -2813,7 +2813,7 @@ namespace OpenTween
                 else
                 {
                     // 連投モードのときだけEnterイベントが起きないので強制的に背景色を戻す
-                    if (this.ToolStripFocusLockMenuItem.Checked)
+                    if (this.FocusLockPullDownMenuItem.Checked)
                         this.StatusText_Enter(this.StatusText, EventArgs.Empty);
                 }
                 return;
@@ -2832,8 +2832,8 @@ namespace OpenTween
             {
                 this.HashMgr.ClearHashtag();
                 this.HashStripSplitButton.Text = "#[-]";
+                this.HashTogglePullDownMenuItem.Checked = false;
                 this.HashToggleMenuItem.Checked = false;
-                this.HashToggleToolStripMenuItem.Checked = false;
             }
 
             this.SetMainWindowTitle();
@@ -4727,13 +4727,13 @@ namespace OpenTween
         {
             statusText = statusText.Replace("\r\n", "\n");
 
-            if (this.ToolStripMenuItemUrlMultibyteSplit.Checked)
+            if (this.UrlMultibyteSplitPullDownMenuItem.Checked)
             {
                 // URLと全角文字の切り離し
                 statusText = Regex.Replace(statusText, @"https?:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#^]+", "$& ");
             }
 
-            if (this.IdeographicSpaceToSpaceToolStripMenuItem.Checked)
+            if (this.IdeographicSpaceToSpacePullDownMenuItem.Checked)
             {
                 // 文中の全角スペースを半角スペース1個にする
                 statusText = statusText.Replace("　", " ");
@@ -4787,7 +4787,7 @@ namespace OpenTween
 
             statusText = header + statusText + footer;
 
-            if (this.ToolStripMenuItemPreventSmsCommand.Checked)
+            if (this.PreventSmsCommandPullDownMenuItem.Checked)
             {
                 // ツイートが意図せず SMS コマンドとして解釈されることを回避 (D, DM, M のみ)
                 // 参照: https://support.twitter.com/articles/14020
@@ -6134,8 +6134,8 @@ namespace OpenTween
                 ShortcutCommand.Create(Keys.Control | Keys.Y)
                     .FocusedOn(FocusedControl.PostBrowser)
                     .Do(() => {
-                        MultiLineMenuItem.Checked = !MultiLineMenuItem.Checked;
-                        MultiLineMenuItem_Click(null, null);
+                        MultiLinePullDownMenuItem.Checked = !MultiLinePullDownMenuItem.Checked;
+                        MultiLinePullDownMenuItem_Click(null, null);
                     }),
 
                 ShortcutCommand.Create(Keys.Shift | Keys.F3)
@@ -7204,10 +7204,10 @@ namespace OpenTween
                 SettingManager.Common.Token = tw.AccessToken;
                 SettingManager.Common.TokenSecret = tw.AccessTokenSecret;
 
-                if (IdeographicSpaceToSpaceToolStripMenuItem != null &&
-                   IdeographicSpaceToSpaceToolStripMenuItem.IsDisposed == false)
+                if (IdeographicSpaceToSpacePullDownMenuItem != null &&
+                   IdeographicSpaceToSpacePullDownMenuItem.IsDisposed == false)
                 {
-                    SettingManager.Common.WideSpaceConvert = this.IdeographicSpaceToSpaceToolStripMenuItem.Checked;
+                    SettingManager.Common.WideSpaceConvert = this.IdeographicSpaceToSpacePullDownMenuItem.Checked;
                 }
 
                 SettingManager.Common.SortOrder = (int)_statuses.SortOrder;
@@ -7242,10 +7242,10 @@ namespace OpenTween
                 SettingManager.Common.HashIsHead = HashMgr.IsHead;
                 SettingManager.Common.HashIsPermanent = HashMgr.IsPermanent;
                 SettingManager.Common.HashIsNotAddToAtReply = HashMgr.IsNotAddToAtReply;
-                if (ToolStripFocusLockMenuItem != null &&
-                        ToolStripFocusLockMenuItem.IsDisposed == false)
+                if (FocusLockPullDownMenuItem != null &&
+                        FocusLockPullDownMenuItem.IsDisposed == false)
                 {
-                    SettingManager.Common.FocusLockToStatusText = this.ToolStripFocusLockMenuItem.Checked;
+                    SettingManager.Common.FocusLockToStatusText = this.FocusLockPullDownMenuItem.Checked;
                 }
                 SettingManager.Common.TrackWord = tw.TrackWord;
                 SettingManager.Common.AllAtReply = tw.AllAtReply;
@@ -9183,7 +9183,7 @@ namespace OpenTween
             if (multiline != this.StatusText.Multiline)
             {
                 this.StatusText.Multiline = multiline;
-                MultiLineMenuItem.Checked = multiline;
+                MultiLinePullDownMenuItem.Checked = multiline;
                 ModifySettingLocal = true;
             }
         }
@@ -9201,9 +9201,9 @@ namespace OpenTween
         private void MultiLineMenuItem_Click(object sender, EventArgs e)
         {
             //発言欄複数行
-            StatusText.Multiline = MultiLineMenuItem.Checked;
-            SettingManager.Local.StatusMultiline = MultiLineMenuItem.Checked;
-            if (MultiLineMenuItem.Checked)
+            StatusText.Multiline = MultiLinePullDownMenuItem.Checked;
+            SettingManager.Local.StatusMultiline = MultiLinePullDownMenuItem.Checked;
+            if (MultiLinePullDownMenuItem.Checked)
             {
                 if (SplitContainer2.Height - _mySpDis2 - SplitContainer2.SplitterWidth < 0)
                     SplitContainer2.SplitterDistance = 0;
@@ -10230,14 +10230,14 @@ namespace OpenTween
                 DebugModeToolStripMenuItem.Visible = false;
         }
 
-        private void ToolStripMenuItemUrlAutoShorten_CheckedChanged(object sender, EventArgs e)
+        private void UrlAutoShortenMenuItem_CheckedChanged(object sender, EventArgs e)
         {
-            SettingManager.Common.UrlConvertAuto = ToolStripMenuItemUrlAutoShorten.Checked;
+            SettingManager.Common.UrlConvertAuto = UrlAutoShortenPullDownMenuItem.Checked;
         }
 
         private void ContextMenuPostMode_Opening(object sender, CancelEventArgs e)
         {
-            ToolStripMenuItemUrlAutoShorten.Checked = SettingManager.Common.UrlConvertAuto;
+            UrlAutoShortenPullDownMenuItem.Checked = SettingManager.Common.UrlConvertAuto;
         }
 
         private void TraceOutToolStripMenuItem_Click(object sender, EventArgs e)
@@ -10552,12 +10552,12 @@ namespace OpenTween
                 return !this.tw.Configuration.NonUsernamePaths.Contains(name.ToLowerInvariant());
         }
 
-        private void IdeographicSpaceToSpaceToolStripMenuItem_Click(object sender, EventArgs e)
+        private void IdeographicSpaceToSpaceMenuItem_Click(object sender, EventArgs e)
         {
             ModifySettingCommon = true;
         }
 
-        private void ToolStripFocusLockMenuItem_CheckedChanged(object sender, EventArgs e)
+        private void FocusLockMenuItem_CheckedChanged(object sender, EventArgs e)
         {
             ModifySettingCommon = true;
         }
@@ -10875,14 +10875,14 @@ namespace OpenTween
             if (!string.IsNullOrEmpty(HashMgr.UseHash))
             {
                 HashStripSplitButton.Text = HashMgr.UseHash;
+                HashTogglePullDownMenuItem.Checked = true;
                 HashToggleMenuItem.Checked = true;
-                HashToggleToolStripMenuItem.Checked = true;
             }
             else
             {
                 HashStripSplitButton.Text = "#[-]";
+                HashTogglePullDownMenuItem.Checked = false;
                 HashToggleMenuItem.Checked = false;
-                HashToggleToolStripMenuItem.Checked = false;
             }
             //if (HashMgr.IsInsert && HashMgr.UseHash != "")
             //{
@@ -10909,13 +10909,13 @@ namespace OpenTween
             {
                 HashStripSplitButton.Text = HashMgr.UseHash;
                 HashToggleMenuItem.Checked = true;
-                HashToggleToolStripMenuItem.Checked = true;
+                HashTogglePullDownMenuItem.Checked = true;
             }
             else
             {
                 HashStripSplitButton.Text = "#[-]";
                 HashToggleMenuItem.Checked = false;
-                HashToggleToolStripMenuItem.Checked = false;
+                HashTogglePullDownMenuItem.Checked = false;
             }
             ModifySettingCommon = true;
             this.StatusText_TextChanged(null, null);
@@ -10930,8 +10930,8 @@ namespace OpenTween
         {
             HashMgr.SetPermanentHash("#" + hashtag);
             HashStripSplitButton.Text = HashMgr.UseHash;
+            HashTogglePullDownMenuItem.Checked = true;
             HashToggleMenuItem.Checked = true;
-            HashToggleToolStripMenuItem.Checked = true;
             //使用ハッシュタグとして設定
             ModifySettingCommon = true;
         }
@@ -11288,7 +11288,7 @@ namespace OpenTween
 
         private void SplitContainer2_MouseDoubleClick(object sender, MouseEventArgs e)
         {
-            this.MultiLineMenuItem.PerformClick();
+            this.MultiLinePullDownMenuItem.PerformClick();
         }
 
         public PostClass CurPost

diff --git a/OpenTween/Tween.en.resx b/OpenTween/Tween.en.resx
index 7275158..210635f 100644 (file)
--- a/OpenTween/Tween.en.resx
+++ b/OpenTween/Tween.en.resx
@@ -121,64 +121,64 @@
   <data name="StatusLabelUrl.Size" type="System.Drawing.Size, System.Drawing">
     <value>410, 23</value>
   </data>
-  <data name="ToolStripMenuItemUrlMultibyteSplit.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="UrlMultibyteSplitPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="ToolStripMenuItemUrlMultibyteSplit.Text" xml:space="preserve">
+  <data name="UrlMultibyteSplitPullDownMenuItem.Text" xml:space="preserve">
     <value>&amp;Separation of multibyte character string from URL</value>
   </data>
-  <data name="ToolStripMenuItemPreventSmsCommand.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="PreventSmsCommandPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="ToolStripMenuItemPreventSmsCommand.Text" xml:space="preserve">
+  <data name="PreventSmsCommandPullDownMenuItem.Text" xml:space="preserve">
     <value>Prevent interpreting text as SMS command</value>
   </data>
-  <data name="ToolStripMenuItemUrlAutoShorten.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="UrlAutoShortenPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="ToolStripMenuItemUrlAutoShorten.Text" xml:space="preserve">
+  <data name="UrlAutoShortenPullDownMenuItem.Text" xml:space="preserve">
     <value>&amp;URL is automatically shortened</value>
   </data>
-  <data name="IdeographicSpaceToSpaceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="IdeographicSpaceToSpacePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="IdeographicSpaceToSpaceToolStripMenuItem.Text" xml:space="preserve">
+  <data name="IdeographicSpaceToSpacePullDownMenuItem.Text" xml:space="preserve">
     <value>&amp;Convert IdeographicSpace to Space</value>
   </data>
-  <data name="MultiLineMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="MultiLinePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="MultiLineMenuItem.Text" xml:space="preserve">
+  <data name="MultiLinePullDownMenuItem.Text" xml:space="preserve">
     <value>Input field is &amp;Multiline</value>
   </data>
-  <data name="ToolStripFocusLockMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="FocusLockPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="ToolStripFocusLockMenuItem.Text" xml:space="preserve">
+  <data name="FocusLockPullDownMenuItem.Text" xml:space="preserve">
     <value>Left focus in input box after posting</value>
   </data>
   <data name="ToolStripSeparator35.Size" type="System.Drawing.Size, System.Drawing">
     <value>442, 6</value>
   </data>
-  <data name="ImageSelectMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="ImageSelectPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="ImageSelectMenuItem.Text" xml:space="preserve">
+  <data name="ImageSelectPullDownMenuItem.Text" xml:space="preserve">
     <value>&amp;Pick a media file</value>
   </data>
   <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
     <value>442, 6</value>
   </data>
-  <data name="HashToggleMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="HashTogglePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="HashToggleMenuItem.Text" xml:space="preserve">
+  <data name="HashTogglePullDownMenuItem.Text" xml:space="preserve">
     <value>&amp;Toggle Hashtag</value>
   </data>
-  <data name="HashManageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="HashManagePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>445, 24</value>
   </data>
-  <data name="HashManageMenuItem.Text" xml:space="preserve">
+  <data name="HashManagePullDownMenuItem.Text" xml:space="preserve">
     <value>Hashtag &amp;Manager</value>
   </data>
   <data name="ContextMenuPostMode.Size" type="System.Drawing.Size, System.Drawing">

diff --git a/OpenTween/Tween.resx b/OpenTween/Tween.resx
index 628c159..d8732dd 100644 (file)
--- a/OpenTween/Tween.resx
+++ b/OpenTween/Tween.resx
@@ -160,79 +160,79 @@
   <metadata name="ContextMenuPostMode.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>651, 17</value>
   </metadata>
-  <data name="ToolStripMenuItemUrlMultibyteSplit.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="UrlMultibyteSplitPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="ToolStripMenuItemUrlMultibyteSplit.Text" xml:space="preserve">
+  <data name="UrlMultibyteSplitPullDownMenuItem.Text" xml:space="preserve">
     <value>URLからの全角文字列の切り離し</value>
   </data>
-  <data name="ToolStripMenuItemPreventSmsCommand.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="PreventSmsCommandPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="ToolStripMenuItemPreventSmsCommand.Text" xml:space="preserve">
+  <data name="PreventSmsCommandPullDownMenuItem.Text" xml:space="preserve">
     <value>SMSコマンドを回避する</value>
   </data>
-  <data name="ToolStripMenuItemUrlAutoShorten.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="UrlAutoShortenPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="ToolStripMenuItemUrlAutoShorten.Text" xml:space="preserve">
+  <data name="UrlAutoShortenPullDownMenuItem.Text" xml:space="preserve">
     <value>自動的にURLを短縮する</value>
   </data>
-  <data name="ToolStripMenuItemUrlAutoShorten.Visible" type="System.Boolean, mscorlib">
+  <data name="UrlAutoShortenPullDownMenuItem.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="IdeographicSpaceToSpaceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="IdeographicSpaceToSpacePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="IdeographicSpaceToSpaceToolStripMenuItem.Text" xml:space="preserve">
+  <data name="IdeographicSpaceToSpacePullDownMenuItem.Text" xml:space="preserve">
     <value>全角スペースを半角スペースにする</value>
   </data>
-  <data name="MultiLineMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+  <data name="MultiLinePullDownMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+Y</value>
   </data>
-  <data name="MultiLineMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="MultiLinePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="MultiLineMenuItem.Text" xml:space="preserve">
+  <data name="MultiLinePullDownMenuItem.Text" xml:space="preserve">
     <value>発言欄複数行入力(&amp;M)</value>
   </data>
-  <data name="ToolStripFocusLockMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="FocusLockPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="ToolStripFocusLockMenuItem.Text" xml:space="preserve">
+  <data name="FocusLockPullDownMenuItem.Text" xml:space="preserve">
     <value>フォーカスを発言欄へロックする</value>
   </data>
   <data name="ToolStripSeparator35.Size" type="System.Drawing.Size, System.Drawing">
     <value>254, 6</value>
   </data>
-  <data name="ImageSelectMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+  <data name="ImageSelectPullDownMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+Shift+P</value>
   </data>
-  <data name="ImageSelectMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="ImageSelectPullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="ImageSelectMenuItem.Text" xml:space="preserve">
+  <data name="ImageSelectPullDownMenuItem.Text" xml:space="preserve">
     <value>投稿画像選択(&amp;P)</value>
   </data>
   <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
     <value>254, 6</value>
   </data>
-  <data name="HashToggleMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+  <data name="HashTogglePullDownMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+Shift+T</value>
   </data>
-  <data name="HashToggleMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="HashTogglePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="HashToggleMenuItem.Text" xml:space="preserve">
+  <data name="HashTogglePullDownMenuItem.Text" xml:space="preserve">
     <value>ハッシュタグ自動付加</value>
   </data>
-  <data name="HashManageMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+  <data name="HashManagePullDownMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+T</value>
   </data>
-  <data name="HashManageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="HashManagePullDownMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>257, 22</value>
   </data>
-  <data name="HashManageMenuItem.Text" xml:space="preserve">
+  <data name="HashManagePullDownMenuItem.Text" xml:space="preserve">
     <value>ハッシュタグ設定</value>
   </data>
   <data name="ContextMenuPostMode.Size" type="System.Drawing.Size, System.Drawing">
@@ -2331,40 +2331,40 @@
   <data name="&gt;&gt;HashStripSplitButton.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSplitButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ToolStripMenuItemUrlMultibyteSplit.Name" xml:space="preserve">
-    <value>ToolStripMenuItemUrlMultibyteSplit</value>
+  <data name="&gt;&gt;UrlMultibyteSplitPullDownMenuItem.Name" xml:space="preserve">
+    <value>UrlMultibyteSplitPullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;ToolStripMenuItemUrlMultibyteSplit.Type" xml:space="preserve">
+  <data name="&gt;&gt;UrlMultibyteSplitPullDownMenuItem.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="&gt;&gt;ToolStripMenuItemPreventSmsCommand.Name" xml:space="preserve">
-    <value>ToolStripMenuItemPreventSmsCommand</value>
+  <data name="&gt;&gt;PreventSmsCommandPullDownMenuItem.Name" xml:space="preserve">
+    <value>PreventSmsCommandPullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;ToolStripMenuItemPreventSmsCommand.Type" xml:space="preserve">
+  <data name="&gt;&gt;PreventSmsCommandPullDownMenuItem.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="&gt;&gt;ToolStripMenuItemUrlAutoShorten.Name" xml:space="preserve">
-    <value>ToolStripMenuItemUrlAutoShorten</value>
+  <data name="&gt;&gt;UrlAutoShortenPullDownMenuItem.Name" xml:space="preserve">
+    <value>UrlAutoShortenPullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;ToolStripMenuItemUrlAutoShorten.Type" xml:space="preserve">
+  <data name="&gt;&gt;UrlAutoShortenPullDownMenuItem.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="&gt;&gt;IdeographicSpaceToSpaceToolStripMenuItem.Name" xml:space="preserve">
-    <value>IdeographicSpaceToSpaceToolStripMenuItem</value>
+  <data name="&gt;&gt;IdeographicSpaceToSpacePullDownMenuItem.Name" xml:space="preserve">
+    <value>IdeographicSpaceToSpacePullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;IdeographicSpaceToSpaceToolStripMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;IdeographicSpaceToSpacePullDownMenuItem.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="&gt;&gt;MultiLineMenuItem.Name" xml:space="preserve">
-    <value>MultiLineMenuItem</value>
+  <data name="&gt;&gt;MultiLinePullDownMenuItem.Name" xml:space="preserve">
+    <value>MultiLinePullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;MultiLineMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;MultiLinePullDownMenuItem.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="&gt;&gt;ToolStripFocusLockMenuItem.Name" xml:space="preserve">
-    <value>ToolStripFocusLockMenuItem</value>
+  <data name="&gt;&gt;FocusLockPullDownMenuItem.Name" xml:space="preserve">
+    <value>FocusLockPullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;ToolStripFocusLockMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;FocusLockPullDownMenuItem.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="&gt;&gt;ToolStripSeparator35.Name" xml:space="preserve">
@@ -2373,10 +2373,10 @@
   <data name="&gt;&gt;ToolStripSeparator35.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ImageSelectMenuItem.Name" xml:space="preserve">
-    <value>ImageSelectMenuItem</value>
+  <data name="&gt;&gt;ImageSelectPullDownMenuItem.Name" xml:space="preserve">
+    <value>ImageSelectPullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;ImageSelectMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;ImageSelectPullDownMenuItem.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="&gt;&gt;ToolStripSeparator8.Name" xml:space="preserve">
@@ -2385,16 +2385,16 @@
   <data name="&gt;&gt;ToolStripSeparator8.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;HashToggleMenuItem.Name" xml:space="preserve">
-    <value>HashToggleMenuItem</value>
+  <data name="&gt;&gt;HashTogglePullDownMenuItem.Name" xml:space="preserve">
+    <value>HashTogglePullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;HashToggleMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;HashTogglePullDownMenuItem.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="&gt;&gt;HashManageMenuItem.Name" xml:space="preserve">
-    <value>HashManageMenuItem</value>
+  <data name="&gt;&gt;HashManagePullDownMenuItem.Name" xml:space="preserve">
+    <value>HashManagePullDownMenuItem</value>
   </data>
-  <data name="&gt;&gt;HashManageMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;HashManagePullDownMenuItem.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="&gt;&gt;AddTabMenuItem.Name" xml:space="preserve">