Commit: d82ff859f775ab6d80fb4baa70f056a0b11ae8fd - opentween (git)

開発に使用するリポジトリ

Commit MetaInfo

• Revisión: d82ff859f775ab6d80fb4baa70f056a0b11ae8fd (tree)
• Tiempo: 2012-12-05 20:24:53
• Autor: Kimura Youichi <kim.upsilon@bucy...>
• Commiter: Kimura Youichi

Log Message

TabsDialog を書き直し

Cambiar Resumen

• modified: .travis.yml
• modified: OpenTween.Tests/OpenTween.Tests.csproj
• add: OpenTween.Tests/TabsDialogTest.cs
• modified: OpenTween/FilterDialog.cs
• modified: OpenTween/OpenTween.csproj
• modified: OpenTween/TabsDialog.Designer.cs
• modified: OpenTween/TabsDialog.cs
• modified: OpenTween/TabsDialog.resx
• modified: OpenTween/Tween.cs

Diferencia incremental

--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ install:
   # Install NUnit 2.6
   - wget -q http://de.archive.ubuntu.com/ubuntu/pool/main/n/nunit/libnunit2.6-cil_2.6.0.12051+dfsg-2_all.deb http://de.archive.ubuntu.com/ubuntu/pool/universe/n/nunit/nunit-console_2.6.0.12051+dfsg-2_all.deb
   - sudo dpkg -i libnunit2.6-cil_2.6.0.12051+dfsg-2_all.deb nunit-console_2.6.0.12051+dfsg-2_all.deb
+  # Setup Xvfb
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 
 # Build
 script:

--- a/OpenTween.Tests/OpenTween.Tests.csproj
+++ b/OpenTween.Tests/OpenTween.Tests.csproj
@@ -52,6 +52,7 @@
   <ItemGroup>
     <Compile Include="MyCommonTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TabsDialogTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenTween\OpenTween.csproj">

--- /dev/null
+++ b/OpenTween.Tests/TabsDialogTest.cs
@@ -0,0 +1,143 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2012      kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+//
+// This file is part of OpenTween.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Windows.Forms;
+using System.Reflection;
+
+namespace OpenTween
+{
+    class TabsDialogTest
+    {
+        private TabInformations tabinfo;
+
+        [SetUp]
+        public void TabInformationSetUp()
+        {
+            this.tabinfo = Activator.CreateInstance(typeof(TabInformations), true) as TabInformations;
+
+            // タブを追加
+            this.tabinfo.AddTab("Recent", MyCommon.TabUsageType.Home, null);
+            this.tabinfo.AddTab("Reply", MyCommon.TabUsageType.Mentions, null);
+            this.tabinfo.AddTab("DM", MyCommon.TabUsageType.DirectMessage, null);
+            this.tabinfo.AddTab("Favorites", MyCommon.TabUsageType.Favorites, null);
+            this.tabinfo.AddTab("MyTab1", MyCommon.TabUsageType.UserDefined, null);
+
+            // 一応 TabInformation.GetInstance() でも取得できるようにする
+            var field = typeof(TabInformations).GetField("_instance",
+                BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.SetField);
+            field.SetValue(null, this.tabinfo);
+        }
+
+        [Test]
+        public void OKButtonEnabledTest()
+        {
+            using (var dialog = new TabsDialog(this.tabinfo))
+            {
+                Assert.That(dialog.OK_Button.Enabled, Is.False);
+
+                dialog.TabList.SelectedIndex = 0;
+
+                Assert.That(dialog.OK_Button.Enabled, Is.True);
+            }
+        }
+
+        [Test]
+        public void MultiSelectTest()
+        {
+            using (var dialog = new TabsDialog(this.tabinfo))
+            {
+                // MultiSelect = false (default)
+                var firstItem = dialog.TabList.Items[0] as TabsDialog.TabListItem;
+                Assert.That(firstItem.Tab, Is.Null); // 「(新規タブ)」
+                Assert.That(dialog.TabList.SelectionMode, Is.EqualTo(SelectionMode.One));
+
+                dialog.MultiSelect = true;
+                firstItem = dialog.TabList.Items[0] as TabsDialog.TabListItem;
+                Assert.That(firstItem.Tab, Is.Not.Null);
+                Assert.That(dialog.TabList.SelectionMode, Is.EqualTo(SelectionMode.MultiExtended));
+
+                dialog.MultiSelect = false;
+                firstItem = dialog.TabList.Items[0] as TabsDialog.TabListItem;
+                Assert.That(firstItem.Tab, Is.Null);
+                Assert.That(dialog.TabList.SelectionMode, Is.EqualTo(SelectionMode.One));
+            }
+        }
+
+        [Test]
+        public void SelectableTabTest()
+        {
+            using (var dialog = new TabsDialog(this.tabinfo))
+            {
+                dialog.MultiSelect = false;
+
+                var item = dialog.TabList.Items[0] as TabsDialog.TabListItem;
+                Assert.That(item.Tab, Is.Null);
+
+                item = dialog.TabList.Items[1] as TabsDialog.TabListItem;
+                Assert.That(item.Tab, Is.EqualTo(this.tabinfo.Tabs["Reply"]));
+
+                item = dialog.TabList.Items[2] as TabsDialog.TabListItem;
+                Assert.That(item.Tab, Is.EqualTo(this.tabinfo.Tabs["MyTab1"]));
+            }
+        }
+
+        [Test]
+        public void SelectedTabTest()
+        {
+            using (var dialog = new TabsDialog(this.tabinfo))
+            {
+                dialog.MultiSelect = false;
+
+                dialog.TabList.SelectedIndex = 0;
+                Assert.That(dialog.SelectedTab, Is.Null);
+
+                dialog.TabList.SelectedIndex = 1;
+                Assert.That(dialog.SelectedTab, Is.EqualTo(this.tabinfo.Tabs["Reply"]));
+            }
+        }
+
+        [Test]
+        public void SelectedTabsTest()
+        {
+            using (var dialog = new TabsDialog(this.tabinfo))
+            {
+                dialog.MultiSelect = true;
+
+                dialog.TabList.SelectedIndices.Clear();
+                var selectedTabs = dialog.SelectedTabs;
+                Assert.That(selectedTabs, Is.Empty);
+
+                dialog.TabList.SelectedIndices.Add(0);
+                selectedTabs = dialog.SelectedTabs;
+                Assert.That(selectedTabs, Is.EquivalentTo(new[] { this.tabinfo.Tabs["Reply"] }));
+
+                dialog.TabList.SelectedIndices.Add(1);
+                selectedTabs = dialog.SelectedTabs;
+                Assert.That(selectedTabs, Is.EquivalentTo(new[] { this.tabinfo.Tabs["Reply"], this.tabinfo.Tabs["MyTab1"] }));
+            }
+        }
+    }
+}

--- a/OpenTween/FilterDialog.cs
+++ b/OpenTween/FilterDialog.cs
@@ -47,8 +47,6 @@ namespace OpenTween
         private string _cur;
         private List<string> idlist = new List<string>();
 
-        private TabsDialog tabdialog = new TabsDialog(true);
-
         private enum EDITMODE
         {
             AddNew,
@@ -878,7 +876,6 @@ namespace OpenTween
             {
                 ListTabs.Items.Add(key);
             }
-            SetTabnamesToDialog();
 
             ComboSound.Items.Clear();
             ComboSound.Items.Add("");
@@ -921,15 +918,6 @@ namespace OpenTween
             }
         }
 
-        private void SetTabnamesToDialog()
-        {
-            tabdialog.ClearTab();
-            foreach (string key in _sts.Tabs.Keys)
-            {
-                if (TabInformations.GetInstance().IsDistributableTab(key)) tabdialog.AddTab(key);
-            }
-        }
-
         private void ListTabs_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (ListTabs.SelectedIndex > -1)
@@ -979,7 +967,6 @@ namespace OpenTween
                 {
                     //成功
                     ListTabs.Items.Add(tabName);
-                    SetTabnamesToDialog();
                 }
             }
         }
@@ -996,7 +983,6 @@ namespace OpenTween
                     idx -= 1;
                     if (idx < 0) idx = 0;
                     ListTabs.SelectedIndex = idx;
-                    SetTabnamesToDialog();
                 }
             }
         }
@@ -1012,7 +998,6 @@ namespace OpenTween
                     ListTabs.Items.RemoveAt(idx);
                     ListTabs.Items.Insert(idx, tb);
                     ListTabs.SelectedIndex = idx;
-                    SetTabnamesToDialog();
                 }
             }
         }
@@ -1133,28 +1118,32 @@ namespace OpenTween
         {
             if (ListTabs.SelectedIndex > -1 && ListFilters.SelectedItem != null)
             {
-                tabdialog.Text = Properties.Resources.ButtonRuleCopy_ClickText1;
-                if (tabdialog.ShowDialog() == DialogResult.Cancel)
+                TabClass[] selectedTabs;
+                using (TabsDialog dialog = new TabsDialog(_sts))
                 {
-                    return;
+                    dialog.MultiSelect = true;
+                    dialog.Text = Properties.Resources.ButtonRuleCopy_ClickText1;
+
+                    if (dialog.ShowDialog(this) == DialogResult.Cancel) return;
+
+                    selectedTabs = dialog.SelectedTabs;
                 }
+
                 string tabname = ListTabs.SelectedItem.ToString();
-                StringCollection tabs = tabdialog.SelectedTabNames;
                 List<FiltersClass> filters = new List<FiltersClass>();
 
                 foreach (int idx in ListFilters.SelectedIndices)
                 {
                     filters.Add(_sts.Tabs[tabname].Filters[idx].CopyTo(new FiltersClass()));
                 }
-                foreach (string tb in tabs)
+                foreach (var tb in selectedTabs)
                 {
-                    if (tb != tabname)
+                    if (tb.TabName == tabname) continue;
+
+                    foreach (FiltersClass flt in filters)
                     {
-                        foreach (FiltersClass flt in filters)
-                        {
-                            if (!_sts.Tabs[tb].Filters.Contains(flt))
-                                _sts.Tabs[tb].AddFilter(flt.CopyTo(new FiltersClass()));
-                        }
+                        if (!tb.Filters.Contains(flt))
+                            tb.AddFilter(flt.CopyTo(new FiltersClass()));
                     }
                 }
                 SetFilters(tabname);
@@ -1165,29 +1154,32 @@ namespace OpenTween
         {
             if (ListTabs.SelectedIndex > -1 && ListFilters.SelectedItem != null)
             {
-                tabdialog.Text = Properties.Resources.ButtonRuleMove_ClickText1;
-                if (tabdialog.ShowDialog() == DialogResult.Cancel)
+                TabClass[] selectedTabs;
+                using (var dialog = new TabsDialog(_sts))
                 {
-                    return;
+                    dialog.MultiSelect = true;
+                    dialog.Text = Properties.Resources.ButtonRuleMove_ClickText1;
+
+                    if (dialog.ShowDialog(this) == DialogResult.Cancel) return;
+
+                    selectedTabs = dialog.SelectedTabs;
                 }
                 string tabname = ListTabs.SelectedItem.ToString();
-                StringCollection tabs = tabdialog.SelectedTabNames;
                 List<FiltersClass> filters = new List<FiltersClass>();
 
                 foreach (int idx in ListFilters.SelectedIndices)
                 {
                     filters.Add(_sts.Tabs[tabname].Filters[idx].CopyTo(new FiltersClass()));
                 }
-                if (tabs.Count == 1 && tabs[0] == tabname) return;
-                foreach (string tb in tabs)
+                if (selectedTabs.Length == 1 && selectedTabs[0].TabName == tabname) return;
+                foreach (var tb in selectedTabs)
                 {
-                    if (tb != tabname)
+                    if (tb.TabName == tabname) continue;
+
+                    foreach (FiltersClass flt in filters)
                     {
-                        foreach (FiltersClass flt in filters)
-                        {
-                            if (!_sts.Tabs[tb].Filters.Contains(flt))
-                                _sts.Tabs[tb].AddFilter(flt.CopyTo(new FiltersClass()));
-                        }
+                        if (!tb.Filters.Contains(flt))
+                            tb.AddFilter(flt.CopyTo(new FiltersClass()));
                     }
                 }
                 for (int idx = ListFilters.Items.Count - 1; idx >= 0; idx--)

--- a/OpenTween/OpenTween.csproj
+++ b/OpenTween/OpenTween.csproj
@@ -130,6 +130,12 @@
     <Compile Include="OTWebClient.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="TabsDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="TabsDialog.Designer.cs">
+      <DependentUpon>TabsDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Thumbnail\Services\Foursquare.cs" />
     <Compile Include="Thumbnail\Services\ImgAzyobuziNet.cs" />
     <Compile Include="Thumbnail\Services\IThumbnailService.cs" />
@@ -216,12 +222,6 @@
     <Compile Include="Setting\SettingTabs.cs" />
     <Compile Include="Setting\SettingLocal.cs" />
     <Compile Include="ShortUrl.cs" />
-    <Compile Include="TabsDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TabsDialog.Designer.cs">
-      <DependentUpon>TabsDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="ShowUserInfo.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -318,6 +318,15 @@
     <EmbeddedResource Include="AppendSettingDialog.zh-CHS.resx">
       <DependentUpon>AppendSettingDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="TabsDialog.en.resx">
+      <DependentUpon>TabsDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TabsDialog.resx">
+      <DependentUpon>TabsDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TabsDialog.zh-CHS.resx">
+      <DependentUpon>TabsDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="TweetThumbnail.resx">
       <DependentUpon>TweetThumbnail.cs</DependentUpon>
     </EmbeddedResource>
@@ -380,9 +389,6 @@
     <EmbeddedResource Include="SearchWord.zh-CHS.resx">
       <DependentUpon>SearchWord.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="TabsDialog.resx">
-      <DependentUpon>TabsDialog.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="ShowUserInfo.en.resx">
       <DependentUpon>ShowUserInfo.cs</DependentUpon>
     </EmbeddedResource>

--- a/OpenTween/TabsDialog.Designer.cs
+++ b/OpenTween/TabsDialog.Designer.cs
@@ -29,20 +29,11 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TabsDialog));
-            this.TableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.OK_Button = new System.Windows.Forms.Button();
             this.Cancel_Button = new System.Windows.Forms.Button();
             this.TabList = new System.Windows.Forms.ListBox();
-            this.TableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
-            // TableLayoutPanel1
-            // 
-            resources.ApplyResources(this.TableLayoutPanel1, "TableLayoutPanel1");
-            this.TableLayoutPanel1.Controls.Add(this.OK_Button, 0, 0);
-            this.TableLayoutPanel1.Controls.Add(this.Cancel_Button, 1, 0);
-            this.TableLayoutPanel1.Name = "TableLayoutPanel1";
-            // 
             // OK_Button
             // 
             resources.ApplyResources(this.OK_Button, "OK_Button");
@@ -57,11 +48,11 @@
             // 
             // TabList
             // 
-            this.TabList.FormattingEnabled = true;
             resources.ApplyResources(this.TabList, "TabList");
-            this.TabList.Items.AddRange(new object[] {
-            resources.GetString("TabList.Items")});
+            this.TabList.FormattingEnabled = true;
             this.TabList.Name = "TabList";
+            this.TabList.SelectedValueChanged += new System.EventHandler(this.TabList_SelectedValueChanged);
+            this.TabList.DoubleClick += new System.EventHandler(this.TabList_DoubleClick);
             // 
             // TabsDialog
             // 
@@ -69,24 +60,23 @@
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.Cancel_Button;
-            this.Controls.Add(this.TableLayoutPanel1);
+            this.Controls.Add(this.Cancel_Button);
+            this.Controls.Add(this.OK_Button);
             this.Controls.Add(this.TabList);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "TabsDialog";
             this.ShowInTaskbar = false;
-            this.TopMost = true;
-            this.TableLayoutPanel1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        internal System.Windows.Forms.TableLayoutPanel TableLayoutPanel1;
         internal System.Windows.Forms.Button OK_Button;
         internal System.Windows.Forms.Button Cancel_Button;
         internal System.Windows.Forms.ListBox TabList;
+
     }
 }
\ No newline at end of file

--- a/OpenTween/TabsDialog.cs
+++ b/OpenTween/TabsDialog.cs
@@ -1,24 +1,19 @@
 // OpenTween - Client of Twitter
-// Copyright (c) 2007-2011 kiri_feather (@kiri_feather) <[e-mail]>
-//           (c) 2008-2011 Moz (@syo68k)
-//           (c) 2008-2011 takeshik (@takeshik) <http://www.takeshik.org/>
-//           (c) 2010-2011 anis774 (@anis774) <http://d.hatena.ne.jp/anis774/>
-//           (c) 2010-2011 fantasticswallow (@f_swallow) <http://twitter.com/f_swallow>
-//           (c) 2011      kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// Copyright (c) 2012      kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
 // All rights reserved.
-// 
+//
 // This file is part of OpenTween.
-// 
+//
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 3 of the License, or (at your option)
 // any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful, but
 // WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 // or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details. 
-// 
+// for more details.
+//
 // You should have received a copy of the GNU General Public License along
 // with this program. If not, see <http://www.gnu.org/licenses/>, or write to
 // the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
@@ -32,157 +27,106 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using System.Collections.Specialized;
 
 namespace OpenTween
 {
     public partial class TabsDialog : Form
     {
-        private bool _multiSelect = false;
-        private string _newtabItem = Properties.Resources.AddNewTabText1;
+        private readonly TabInformations TabInfo;
 
-        public TabsDialog()
+        private bool _MultiSelect = false;
+        public bool MultiSelect
         {
-            InitializeComponent();
+            get { return this._MultiSelect; }
+            set { this._MultiSelect = value; this.UpdateTabList(); }
         }
 
-        public TabsDialog(bool multiselect)
+        protected internal class TabListItem
         {
-            // この呼び出しはデザイナーで必要です。
-            InitializeComponent();
-
-            // InitializeComponent() 呼び出しの後で初期化を追加します。
-
-            this.MultiSelect = true;
-
-        }
+            public TabClass Tab { get; set; }
+            public string Label { get; set; }
 
-        private void TabsDialog_Load(object sender, EventArgs e)
-        {
-            if (_multiSelect)
-            {
-                TabList.SelectedIndex = -1;
-            }
-            else
+            public override string ToString()
             {
-                if (TabList.SelectedIndex == -1) TabList.SelectedIndex = 0;
+                return this.Label;
             }
         }
 
-        public void AddTab(string tabName)
+        public TabsDialog(TabInformations tabinformation)
         {
-            foreach (string obj in TabList.Items)
-            {
-                if (obj == tabName) return;
-            }
-            TabList.Items.Add(tabName);
-        }
+            InitializeComponent();
 
-        public void RemoveTab(string tabName)
-        {
-            for (int i = 0; i < TabList.Items.Count; i++)
-            {
-                if (((string)TabList.Items[i]) == tabName)
-                {
-                    TabList.Items.RemoveAt(i);
-                    return;
-                }
-            }
+            this.TabInfo = tabinformation;
+            UpdateTabList();
         }
 
-        public void ClearTab()
+        protected void UpdateTabList()
         {
-            int startidx = 1;
+            this.TabList.Items.Clear();
 
-            if (_multiSelect)
+            if (this.MultiSelect)
             {
-                startidx = 0;
+                this.TabList.SelectionMode = SelectionMode.MultiExtended;
             }
-            for (int i = startidx; i < TabList.Items.Count; i++)
+            else
             {
-                TabList.Items.RemoveAt(0);
-            }
-        }
+                this.TabList.SelectionMode = SelectionMode.One;
 
-        public string SelectedTabName
-        {
-            get
-            {
-                if (TabList.SelectedIndex == -1)
-                    return "";
-                else
-                    return (string)TabList.SelectedItem;
+                this.TabList.Items.Add(new TabListItem
+                {
+                    Label = Properties.Resources.AddNewTabText1,
+                    Tab = null,
+                });
             }
-        }
 
-        public StringCollection SelectedTabNames
-        {
-            get
+            foreach (var tab in this.TabInfo.Tabs)
             {
-                if (TabList.SelectedIndex == -1)
-                {
-                    return null;
-                }
-                else
+                if (!this.TabInfo.IsDistributableTab(tab.Key)) continue;
+
+                this.TabList.Items.Add(new TabListItem
                 {
-                    StringCollection ret = new StringCollection();
-                    foreach (object selitem in TabList.SelectedItems)
-                    {
-                        ret.Add((string)selitem);
-                    }
-                    return ret;
-                }
+                    Label = tab.Key,
+                    Tab = tab.Value,
+                });
             }
         }
 
-        public bool MultiSelect
+        private void TabList_DoubleClick(object sender, EventArgs e)
         {
-            get { return _multiSelect; }
-            set
-            {
-                _multiSelect = value;
-                if (value)
-                {
-                    this.TabList.SelectionMode = SelectionMode.MultiExtended;
-                    if (this.TabList.Items[0].ToString() == Properties.Resources.AddNewTabText1)
-                    {
-                        this.TabList.Items.RemoveAt(0);
-                    }
-                }
-                else
-                {
-                    this.TabList.SelectionMode = SelectionMode.One;
-                    if (this.TabList.Items[0].ToString() != Properties.Resources.AddNewTabText1)
-                    {
-                        this.TabList.Items.Insert(0, Properties.Resources.AddNewTabText1);
-                    }
-                }
-            }
+            if (this.TabList.SelectedIndex == -1) return;
+
+            this.DialogResult = DialogResult.OK;
+            this.Close();
         }
 
-        private void TabList_SelectedIndexChanged(object sender, EventArgs e)
+        private void TabList_SelectedValueChanged(object sender, EventArgs e)
         {
+            if (this.TabList.SelectedIndex == -1)
+                this.OK_Button.Enabled = false;
+            else
+                this.OK_Button.Enabled = true;
         }
 
-        private void TabList_DoubleClick(object sender, EventArgs e)
+        public TabClass SelectedTab
         {
-            if (TabList.SelectedItem == null)
+            get
             {
-                return;
-            }
+                var item = this.TabList.SelectedItem as TabListItem;
+                if (item == null) return null;
 
-            if (TabList.IndexFromPoint(TabList.PointToClient(Control.MousePosition)) == ListBox.NoMatches)
-            {
-                return;
+                return item.Tab;
             }
-
-            this.DialogResult = DialogResult.OK;
-            this.Close();
         }
 
-        private void TabsDialog_Shown(object sender, EventArgs e)
+        public TabClass[] SelectedTabs
         {
-            TabList.Focus();
+            get
+            {
+                return this.TabList.SelectedItems
+                    .Cast<TabListItem>()
+                    .Select(x => x.Tab)
+                    .ToArray();
+            }
         }
     }
 }

--- a/OpenTween/TabsDialog.resx
+++ b/OpenTween/TabsDialog.resx
@@ -118,22 +118,22 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="TableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+  <data name="OK_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="TableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="OK_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>None</value>
+  <data name="OK_Button.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>13, 130</value>
+  </data>
+  <data name="OK_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="OK_Button.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 21</value>
+    <value>89, 26</value>
   </data>
   <data name="OK_Button.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -148,19 +148,22 @@
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;OK_Button.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
+    <value>$this</value>
   </data>
   <data name="&gt;&gt;OK_Button.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="Cancel_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>None</value>
+    <value>Bottom, Right</value>
   </data>
   <data name="Cancel_Button.Location" type="System.Drawing.Point, System.Drawing">
-    <value>76, 3</value>
+    <value>110, 130</value>
+  </data>
+  <data name="Cancel_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="Cancel_Button.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 21</value>
+    <value>89, 26</value>
   </data>
   <data name="Cancel_Button.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -175,49 +178,25 @@
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;Cancel_Button.Parent" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;Cancel_Button.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 111</value>
-  </data>
-  <data name="TableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="TableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 27</value>
-  </data>
-  <data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Name" xml:space="preserve">
-    <value>TableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TableLayoutPanel1.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;TableLayoutPanel1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;Cancel_Button.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="TableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="OK_Button" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="Cancel_Button" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
+  <data name="TabList.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="TabList.ItemHeight" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="TabList.Items" xml:space="preserve">
-    <value>(新規タブ)</value>
+    <value>15</value>
   </data>
   <data name="TabList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 12</value>
+    <value>13, 13</value>
+  </data>
+  <data name="TabList.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="TabList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 88</value>
+    <value>186, 109</value>
   </data>
   <data name="TabList.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -232,16 +211,22 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;TabList.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+    <value>8, 15</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>169, 149</value>
+    <value>212, 169</value>
+  </data>
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>

--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -103,7 +103,6 @@ namespace OpenTween
 
         //サブ画面インスタンス
         private AppendSettingDialog SettingDialog = AppendSettingDialog.Instance;       //設定画面インスタンス
-        private TabsDialog TabDialog = new TabsDialog();        //タブ選択ダイアログインスタンス
         private SearchWord SearchDialog = new SearchWord();     //検索画面インスタンス
         private FilterDialog fltDialog = new FilterDialog(); //フィルター編集画面
         private OpenURL UrlDialog = new OpenURL();
@@ -343,7 +342,6 @@ namespace OpenTween
         {
             //後始末
             SettingDialog.Dispose();
-            TabDialog.Dispose();
             SearchDialog.Dispose();
             fltDialog.Dispose();
             UrlDialog.Dispose();
@@ -578,7 +576,6 @@ namespace OpenTween
             SettingDialog.Owner = this;;
             SearchDialog.Owner = this;
             fltDialog.Owner = this;
-            TabDialog.Owner = this;
             UrlDialog.Owner = this;
 
             _history.Add(new PostingStatus());
@@ -4599,8 +4596,6 @@ namespace OpenTween
             _colHd8.Text = ColumnText[7];
             _colHd8.Width = 50;
 
-            if (_statuses.IsDistributableTab(tabName)) TabDialog.AddTab(tabName);
-
             _listCustom.SmallImageList = new ImageList();
             if (_iconSz > 0)
             {
@@ -4770,8 +4765,6 @@ namespace OpenTween
             _listCustom.DrawSubItem -= MyList_DrawSubItem;
             _listCustom.HScrolled -= MyList_HScrolled;
 
-            TabDialog.RemoveTab(TabName);
-
             _listCustom.SmallImageList = null;
             _listCustom.ListViewItemSorter = null;
 
@@ -8037,10 +8030,6 @@ namespace OpenTween
                 //タブ名のリスト作り直し（デフォルトタブ以外は再作成）
                 for (int i = 0; i < ListTab.TabCount; i++)
                 {
-                    if (_statuses.IsDistributableTab(ListTab.TabPages[i].Text))
-                    {
-                        TabDialog.RemoveTab(ListTab.TabPages[i].Text);
-                    }
                     if (ListTab.TabPages[i].Text == tabName)
                     {
                         ListTab.TabPages[i].Text = newTabText;
@@ -8056,7 +8045,6 @@ namespace OpenTween
                         {
                             ListTab.TabPages[i].Text = newTabText;
                         }
-                        TabDialog.AddTab(ListTab.TabPages[i].Text);
                     }
                 }
                 SaveConfigsCommon();
@@ -8869,9 +8857,9 @@ namespace OpenTween
             //選択発言を元にフィルタ追加
             foreach (int idx in _curList.SelectedIndices)
             {
-                string tabName = "";
+                string tabName;
                 //タブ選択（or追加）
-                if (!SelectTab(ref tabName)) return;
+                if (!SelectTab(out tabName)) return;
 
                 fltDialog.SetCurrent(tabName);
                 if (_statuses[_curTab.Text, idx].RetweetedId == 0)
@@ -9013,13 +9001,13 @@ namespace OpenTween
 
         private void IDRuleMenuItem_Click(object sender, EventArgs e)
         {
-            string tabName = "";
+            string tabName;
 
             //未選択なら処理終了
             if (_curList.SelectedIndices.Count == 0) return;
 
             //タブ選択（or追加）
-            if (!SelectTab(ref tabName)) return;
+            if (!SelectTab(out tabName)) return;
 
             bool mv = false;
             bool mk = false;
@@ -9095,22 +9083,24 @@ namespace OpenTween
             SaveConfigsTabs();
         }
 
-        private bool SelectTab(ref string tabName)
+        private bool SelectTab(out string tabName)
         {
             do
             {
+                tabName = null;
+
                 //振り分け先タブ選択
-                if (TabDialog.ShowDialog() == DialogResult.Cancel || string.IsNullOrEmpty(this.TabDialog.SelectedTabName))
+                using (var dialog = new TabsDialog(_statuses))
                 {
-                    this.TopMost = SettingDialog.AlwaysTop;
-                    return false;
+                    if (dialog.ShowDialog(this) == DialogResult.Cancel) return false;
+
+                    var selectedTab = dialog.SelectedTab;
+                    tabName = selectedTab == null ? null : selectedTab.TabName;
                 }
-                this.TopMost = SettingDialog.AlwaysTop;
-                tabName = TabDialog.SelectedTabName;
 
                 ListTab.SelectedTab.Focus();
                 //新規タブを選択→タブ作成
-                if (tabName == Properties.Resources.IDRuleMenuItem_ClickText1)
+                if (tabName == null)
                 {
                     using (InputTabName inputName = new InputTabName())
                     {
@@ -11545,13 +11535,13 @@ namespace OpenTween
             string name = GetUserId();
             if (name != null)
             {
-                string tabName = "";
+                string tabName;
 
                 //未選択なら処理終了
                 if (_curList.SelectedIndices.Count == 0) return;
 
                 //タブ選択（or追加）
-                if (!SelectTab(ref tabName)) return;
+                if (!SelectTab(out tabName)) return;
 
                 bool mv = false;
                 bool mk = false;