アイコンサイズの変更メニューを階層化

ソート順をロックするメニューを追加

diff --git a/OpenTween/DetailsListView.cs b/OpenTween/DetailsListView.cs
index 02da661..d309870 100644 (file)
--- a/OpenTween/DetailsListView.cs
+++ b/OpenTween/DetailsListView.cs
@@ -41,7 +41,7 @@ namespace OpenTween.OpenTweenCustomControl
         private Rectangle changeBounds;
         private EventHandlerList _handlers = new EventHandlerList();
 
-        public ContextMenuStrip ColumnHeaderContextMenuStrip;
+        public ContextMenuStrip ColumnHeaderContextMenuStrip { get; set; }
 
         public event EventHandler VScrolled;
         public event EventHandler HScrolled;

diff --git a/OpenTween/Tween.Designer.cs b/OpenTween/Tween.Designer.cs
index 3ae7481..1739b11 100644 (file)
--- a/OpenTween/Tween.Designer.cs
+++ b/OpenTween/Tween.Designer.cs
@@ -315,11 +315,14 @@
             this.TimerRefreshIcon = new System.Windows.Forms.Timer(this.components);
             this.PostStateImageList = new System.Windows.Forms.ImageList(this.components);
             this.ContextMenuColumnHeader = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.IconSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.IconSizeNoneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.IconSize16ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.IconSize24ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.IconSize48ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.IconSize48_2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ToolStripSeparator45 = new System.Windows.Forms.ToolStripSeparator();
+            this.LockListSortOrderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripContainer1.BottomToolStripPanel.SuspendLayout();
             this.ToolStripContainer1.ContentPanel.SuspendLayout();
             this.ToolStripContainer1.TopToolStripPanel.SuspendLayout();
@@ -2512,14 +2515,23 @@
             // ContextMenuColumnHeader
             // 
             this.ContextMenuColumnHeader.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.IconSizeToolStripMenuItem,
+            this.ToolStripSeparator45,
+            this.LockListSortOrderToolStripMenuItem});
+            this.ContextMenuColumnHeader.Name = "ContextMenuColumnHeader";
+            resources.ApplyResources(this.ContextMenuColumnHeader, "ContextMenuColumnHeader");
+            this.ContextMenuColumnHeader.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuColumnHeader_Opening);
+            // 
+            // IconSizeToolStripMenuItem
+            // 
+            this.IconSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.IconSizeNoneToolStripMenuItem,
             this.IconSize16ToolStripMenuItem,
             this.IconSize24ToolStripMenuItem,
             this.IconSize48ToolStripMenuItem,
             this.IconSize48_2ToolStripMenuItem});
-            this.ContextMenuColumnHeader.Name = "ContextMenuColumnHeader";
-            resources.ApplyResources(this.ContextMenuColumnHeader, "ContextMenuColumnHeader");
-            this.ContextMenuColumnHeader.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuColumnHeader_Opening);
+            this.IconSizeToolStripMenuItem.Name = "IconSizeToolStripMenuItem";
+            resources.ApplyResources(this.IconSizeToolStripMenuItem, "IconSizeToolStripMenuItem");
             // 
             // IconSizeNoneToolStripMenuItem
             // 
@@ -2551,6 +2563,18 @@
             resources.ApplyResources(this.IconSize48_2ToolStripMenuItem, "IconSize48_2ToolStripMenuItem");
             this.IconSize48_2ToolStripMenuItem.Click += new System.EventHandler(this.IconSize48_2ToolStripMenuItem_Click);
             // 
+            // ToolStripSeparator45
+            // 
+            this.ToolStripSeparator45.Name = "ToolStripSeparator45";
+            resources.ApplyResources(this.ToolStripSeparator45, "ToolStripSeparator45");
+            // 
+            // LockListSortOrderToolStripMenuItem
+            // 
+            this.LockListSortOrderToolStripMenuItem.Name = "LockListSortOrderToolStripMenuItem";
+            this.LockListSortOrderToolStripMenuItem.CheckOnClick = true;
+            resources.ApplyResources(this.LockListSortOrderToolStripMenuItem, "LockListSortOrderToolStripMenuItem");
+            this.LockListSortOrderToolStripMenuItem.Click += new System.EventHandler(this.LockListSortToolStripMenuItem_Click);
+            // 
             // TweenMain
             // 
             resources.ApplyResources(this, "$this");
@@ -2901,11 +2925,14 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator44;
         private System.Windows.Forms.ToolStripMenuItem OpenURLFileMenuItem;
         internal System.Windows.Forms.ContextMenuStrip ContextMenuColumnHeader;
+        internal System.Windows.Forms.ToolStripMenuItem IconSizeToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem IconSizeNoneToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem IconSize16ToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem IconSize24ToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem IconSize48ToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem IconSize48_2ToolStripMenuItem;
+        internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator45;
+        internal System.Windows.Forms.ToolStripMenuItem LockListSortOrderToolStripMenuItem;
 
     }
 }
\ No newline at end of file

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index f33c0f8..abade04 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -13436,6 +13436,8 @@ namespace OpenTween
             this.IconSize24ToolStripMenuItem.Checked = SettingDialog.IconSz == MyCommon.IconSizes.Icon24;
             this.IconSize48ToolStripMenuItem.Checked = SettingDialog.IconSz == MyCommon.IconSizes.Icon48;
             this.IconSize48_2ToolStripMenuItem.Checked = SettingDialog.IconSz == MyCommon.IconSizes.Icon48_2;
+
+            this.LockListSortOrderToolStripMenuItem.Checked = SettingDialog.SortOrderLock;
         }
 
         private void IconSizeNoneToolStripMenuItem_Click(object sender, EventArgs e)
@@ -13478,5 +13480,15 @@ namespace OpenTween
 
             SaveConfigsCommon();
         }
+
+        private void LockListSortToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var state = this.LockListSortOrderToolStripMenuItem.Checked;
+            if (SettingDialog.SortOrderLock == state) return;
+
+            SettingDialog.SortOrderLock = state;
+
+            SaveConfigsCommon();
+        }
     }
 }

diff --git a/OpenTween/Tween.en.resx b/OpenTween/Tween.en.resx
index ff47854..7256a75 100644 (file)
--- a/OpenTween/Tween.en.resx
+++ b/OpenTween/Tween.en.resx
@@ -1967,6 +1967,12 @@
         AacB8QL/Ac8C/wH7Ac8B+wL/Cw==
 </value>
   </data>
+  <data name="IconSizeToolStripMenuItem.Text" xml:space="preserve">
+    <value>Icon size</value>
+  </data>
+  <data name="LockListSortOrderToolStripMenuItem.Text" xml:space="preserve">
+    <value>Lock sort order</value>
+  </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>574, 382</value>
   </data>

diff --git a/OpenTween/Tween.resx b/OpenTween/Tween.resx
index dd86d1b..c1d07f5 100644 (file)
--- a/OpenTween/Tween.resx
+++ b/OpenTween/Tween.resx
@@ -4761,6 +4761,9 @@
   <data name="DeleteStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>288, 24</value>
   </data>
+  <data name="IconSizeToolStripMenuItem.Text" xml:space="preserve">
+    <value>アイコンサイズ</value>
+  </data>
   <data name="IconSizeNoneToolStripMenuItem.Text" xml:space="preserve">
     <value>none</value>
   </data>
@@ -4776,12 +4779,21 @@
   <data name="IconSize48_2ToolStripMenuItem.Text" xml:space="preserve">
     <value>48*48(2Column)</value>
   </data>
+  <data name="LockListSortOrderToolStripMenuItem.Text" xml:space="preserve">
+    <value>ソート順をロック</value>
+  </data>
   <data name="&gt;&gt;ContextMenuColumnHeader.Name" xml:space="preserve">
     <value>ContextMenuColumnHeader</value>
   </data>
   <data name="&gt;&gt;ContextMenuColumnHeader.Type" xml:space="preserve">
     <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;IconSizeToolStripMenuItem.Name" xml:space="preserve">
+    <value>IconSizeToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;IconSizeToolStripMenuItem.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;IconSizeNoneToolStripMenuItem.Name" xml:space="preserve">
     <value>IconSizeNoneToolStripMenuItem</value>
   </data>
@@ -4812,6 +4824,18 @@
   <data name="&gt;&gt;IconSize48_2ToolStripMenuItem.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;ToolStripSeparator45.Name" xml:space="preserve">
+    <value>ToolStripSeparator45</value>
+  </data>
+  <data name="&gt;&gt;ToolStripSeparator45.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;LockListSortOrderToolStripMenuItem.Name" xml:space="preserve">
+    <value>LockListSortOrderToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;LockListSortOrderToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <metadata name="PostStateImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>143, 17</value>
   </metadata>