From b2fb13272dc235c86f9f10c91f45114fda564b90 Mon Sep 17 00:00:00 2001 From: spx Date: Sun, 17 May 2015 04:02:28 +0900 Subject: [PATCH] =?utf8?q?=E6=8C=AF=E3=82=8A=E5=88=86=E3=81=91=E3=83=AB?= =?utf8?q?=E3=83=BC=E3=83=AB=E3=81=AE=E8=A1=A8=E7=A4=BA=E8=89=B2=E3=82=92?= =?utf8?q?=E5=A4=89=E6=9B=B4=20=E9=81=B8=E6=8A=9E=E7=8A=B6=E6=85=8B?= =?utf8?q?=E3=81=AE=E3=83=AB=E3=83=BC=E3=83=AB=E3=81=AF=E6=9C=89=E5=8A=B9?= =?utf8?q?=E7=84=A1=E5=8A=B9=E9=96=A2=E4=BF=82=E3=81=AA=E3=81=8FHighlightT?= =?utf8?q?ext=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=80=82?= =?utf8?q?=E4=BB=A3=E3=82=8F=E3=82=8A=E3=81=AB=E3=80=81=E7=84=A1=E5=8A=B9?= =?utf8?q?=E7=8A=B6=E6=85=8B=E3=81=AE=E3=83=AB=E3=83=BC=E3=83=AB=E3=81=AB?= =?utf8?q?=E3=81=AF=E7=84=A1=E5=8A=B9=E3=81=A0=E3=81=A8=E5=88=86=E3=81=8B?= =?utf8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=85=88=E9=A0=AD=E3=81=AB=E3=81=A8=E8=A1=A8=E8=A8=98=E3=81=99=E3=82=8B?= =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- OpenTween/FilterDialog.cs | 6 ++++-- OpenTween/PostFilterRule.cs | 6 ++++++ OpenTween/Properties/Resources.Designer.cs | 24 ++++++++++++------------ OpenTween/Properties/Resources.en.resx | 8 ++++---- OpenTween/Properties/Resources.resx | 4 ++-- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/OpenTween/FilterDialog.cs b/OpenTween/FilterDialog.cs index 43967610..681fe039 100644 --- a/OpenTween/FilterDialog.cs +++ b/OpenTween/FilterDialog.cs @@ -1397,8 +1397,10 @@ namespace OpenTween var isSelected = e.State.HasFlag(DrawItemState.Selected); Brush textBrush; - if (filter.Enabled) - textBrush = isSelected ? SystemBrushes.HighlightText : SystemBrushes.WindowText; + if (isSelected) + textBrush = SystemBrushes.HighlightText; + else if (filter.Enabled) + textBrush = SystemBrushes.WindowText; else textBrush = SystemBrushes.GrayText; diff --git a/OpenTween/PostFilterRule.cs b/OpenTween/PostFilterRule.cs index 78c6c73c..00f81380 100644 --- a/OpenTween/PostFilterRule.cs +++ b/OpenTween/PostFilterRule.cs @@ -560,6 +560,12 @@ namespace OpenTween protected virtual string MakeSummary() { var fs = new StringBuilder(); + if (!this.Enabled) + { + fs.Append("<"); + fs.Append(Properties.Resources.Disabled); + fs.Append("> "); + } if (!string.IsNullOrEmpty(this.FilterName) || this.FilterBody.Length > 0 || this.FilterRt || !string.IsNullOrEmpty(this.FilterSource)) { if (this.UseNameField) diff --git a/OpenTween/Properties/Resources.Designer.cs b/OpenTween/Properties/Resources.Designer.cs index 51efa952..06c0c564 100644 --- a/OpenTween/Properties/Resources.Designer.cs +++ b/OpenTween/Properties/Resources.Designer.cs @@ -901,20 +901,20 @@ namespace OpenTween.Properties { } /// - /// 無効 に類似しているローカライズされた文字列を検索します。 + /// 無効化 に類似しているローカライズされた文字列を検索します。 /// - internal static string Disable { + internal static string DisableButtonCaption { get { - return ResourceManager.GetString("Disable", resourceCulture); + return ResourceManager.GetString("DisableButtonCaption", resourceCulture); } } /// - /// 無効化 に類似しているローカライズされた文字列を検索します。 + /// 無効 に類似しているローカライズされた文字列を検索します。 /// - internal static string DisableButtonCaption { + internal static string Disabled { get { - return ResourceManager.GetString("DisableButtonCaption", resourceCulture); + return ResourceManager.GetString("Disabled", resourceCulture); } } @@ -973,20 +973,20 @@ namespace OpenTween.Properties { } /// - /// 有効 に類似しているローカライズされた文字列を検索します。 + /// 有効化 に類似しているローカライズされた文字列を検索します。 /// - internal static string Enable { + internal static string EnableButtonCaption { get { - return ResourceManager.GetString("Enable", resourceCulture); + return ResourceManager.GetString("EnableButtonCaption", resourceCulture); } } /// - /// 有効化 に類似しているローカライズされた文字列を検索します。 + /// 有効 に類似しているローカライズされた文字列を検索します。 /// - internal static string EnableButtonCaption { + internal static string Enabled { get { - return ResourceManager.GetString("EnableButtonCaption", resourceCulture); + return ResourceManager.GetString("Enabled", resourceCulture); } } diff --git a/OpenTween/Properties/Resources.en.resx b/OpenTween/Properties/Resources.en.resx index 2937c71b..1f390177 100644 --- a/OpenTween/Properties/Resources.en.resx +++ b/OpenTween/Properties/Resources.en.resx @@ -994,11 +994,11 @@ Do you want to upload the {1} selected media file(s)? This file type forbidden to use as icon image. - - Disable + + Disabled - - Enable + + Enabled Faild to get relation info. diff --git a/OpenTween/Properties/Resources.resx b/OpenTween/Properties/Resources.resx index 4c12432a..1b4a85be 100644 --- a/OpenTween/Properties/Resources.resx +++ b/OpenTween/Properties/Resources.resx @@ -1040,10 +1040,10 @@ UserStream接続 : - + 無効 - + 有効 -- 2.11.0