From: Kimura Youichi Date: Sun, 27 Jul 2014 07:11:48 +0000 (+0900) Subject: PreviewPanelに対する設定値の設定・取得を LoadConfing/SaveConfig メソッドに移動 X-Git-Tag: OpenTween_v1.2.3~10^2~12 X-Git-Url: http://git.osdn.net/view?p=opentween%2Fopen-tween.git;a=commitdiff_plain;h=e9c172dc26c130974268cbfe01051336d618ac75 PreviewPanelに対する設定値の設定・取得を LoadConfing/SaveConfig メソッドに移動 --- diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs index 095023ee..629a5bd0 100644 --- a/OpenTween/AppendSettingDialog.cs +++ b/OpenTween/AppendSettingDialog.cs @@ -63,7 +63,6 @@ namespace OpenTween public List UserAccounts; private long? InitialUserId; public bool IsRemoveSameEvent; - public bool IsNotifyUseGrowl; public TwitterConfiguration TwitterConfiguration = TwitterConfiguration.DefaultConfiguration(); @@ -80,6 +79,7 @@ namespace OpenTween this.ActionPanel.LoadConfig(settingCommon, settingLocal); this.FontPanel.LoadConfig(settingLocal); this.FontPanel2.LoadConfig(settingLocal); + this.PreviewPanel.LoadConfig(settingCommon); } public void SaveConfig(SettingCommon settingCommon, SettingLocal settingLocal) @@ -91,6 +91,7 @@ namespace OpenTween this.ActionPanel.SaveConfig(settingCommon, settingLocal); this.FontPanel.SaveConfig(settingLocal); this.FontPanel2.SaveConfig(settingLocal); + this.PreviewPanel.SaveConfig(settingCommon); } private void TreeViewSetting_BeforeSelect(object sender, TreeViewCancelEventArgs e) @@ -216,49 +217,8 @@ namespace OpenTween #endif try { - switch (this.PreviewPanel.cmbNameBalloon.SelectedIndex) - { - case 0: - NameBalloon = MyCommon.NameBalloonEnum.None; - break; - case 1: - NameBalloon = MyCommon.NameBalloonEnum.UserID; - break; - case 2: - NameBalloon = MyCommon.NameBalloonEnum.NickName; - break; - } - CountApi = int.Parse(this.GetCountPanel.TextCountApi.Text); CountApiReply = int.Parse(this.GetCountPanel.TextCountApiReply.Text); - DispUsername = this.PreviewPanel.CheckDispUsername.Checked; - switch (this.PreviewPanel.ComboDispTitle.SelectedIndex) - { - case 0: //None - DispLatestPost = MyCommon.DispTitleEnum.None; - break; - case 1: //Ver - DispLatestPost = MyCommon.DispTitleEnum.Ver; - break; - case 2: //Post - DispLatestPost = MyCommon.DispTitleEnum.Post; - break; - case 3: //RepCount - DispLatestPost = MyCommon.DispTitleEnum.UnreadRepCount; - break; - case 4: //AllCount - DispLatestPost = MyCommon.DispTitleEnum.UnreadAllCount; - break; - case 5: //Rep+All - DispLatestPost = MyCommon.DispTitleEnum.UnreadAllRepCount; - break; - case 6: //Unread/All - DispLatestPost = MyCommon.DispTitleEnum.UnreadCountAllCount; - break; - case 7: //Count of Status/Follow/Follower - DispLatestPost = MyCommon.DispTitleEnum.OwnStatus; - break; - } TinyUrlResolve = this.ShortUrlPanel.CheckTinyURL.Checked; ShortUrl.Instance.DisableExpanding = !TinyUrlResolve; if (this.ProxyPanel.RadioProxyNone.Checked) @@ -277,13 +237,11 @@ namespace OpenTween ProxyPort = int.Parse(this.ProxyPanel.TextProxyPort.Text.Trim()); ProxyUser = this.ProxyPanel.TextProxyUser.Text.Trim(); ProxyPassword = this.ProxyPanel.TextProxyPassword.Text.Trim(); - AlwaysTop = this.PreviewPanel.CheckAlwaysTop.Checked; UrlConvertAuto = this.ShortUrlPanel.CheckAutoConvertUrl.Checked; ShortenTco = this.ShortUrlPanel.ShortenTcoCheck.Checked; Nicoms = this.CooperatePanel.CheckNicoms.Checked; DefaultTimeOut = int.Parse(this.ConnectionPanel.ConnectionTimeOut.Text); - LimitBalloon = this.PreviewPanel.CheckBalloonLimit.Checked; EventNotifyEnabled = this.NotifyPanel.CheckEventNotify.Checked; GetEventNotifyFlag(ref _MyEventNotifyFlag, ref _isMyEventNotifyFlag); ForceEventNotify = this.NotifyPanel.CheckForceEventNotify.Checked; @@ -291,44 +249,9 @@ namespace OpenTween TranslateLanguage = Bing.GetLanguageEnumFromIndex(this.CooperatePanel.ComboBoxTranslateLanguage.SelectedIndex); EventSoundFile = (string)this.NotifyPanel.ComboBoxEventNotifySound.SelectedItem; AutoShortUrlFirst = (MyCommon.UrlConverter)this.ShortUrlPanel.ComboBoxAutoShortUrlFirst.SelectedIndex; - TabIconDisp = this.PreviewPanel.chkTabIconDisp.Checked; - IsMonospace = this.PreviewPanel.CheckMonospace.Checked; BitlyUser = this.ShortUrlPanel.TextBitlyId.Text; BitlyPwd = this.ShortUrlPanel.TextBitlyPw.Text; - PreviewEnable = this.PreviewPanel.CheckPreviewEnable.Checked; - StatusAreaAtBottom = this.PreviewPanel.CheckStatusAreaAtBottom.Checked; TwitterApiUrl = this.ConnectionPanel.TwitterAPIText.Text.Trim(); - switch (this.PreviewPanel.ReplyIconStateCombo.SelectedIndex) - { - case 0: - ReplyIconState = MyCommon.REPLY_ICONSTATE.None; - break; - case 1: - ReplyIconState = MyCommon.REPLY_ICONSTATE.StaticIcon; - break; - case 2: - ReplyIconState = MyCommon.REPLY_ICONSTATE.BlinkIcon; - break; - } - switch (this.PreviewPanel.LanguageCombo.SelectedIndex) - { - case 0: - Language = "OS"; - break; - case 1: - Language = "ja"; - break; - case 2: - Language = "en"; - break; - case 3: - Language = "zh-CN"; - break; - default: - Language = "en"; - break; - } - BlinkNewMentions = this.PreviewPanel.ChkNewMentionsBlink.Checked; UseAdditionalCount = this.GetCountPanel.UseChangeGetCount.Checked; MoreCountApi = int.Parse(this.GetCountPanel.GetMoreTextCountApi.Text); FirstCountApi = int.Parse(this.GetCountPanel.FirstTextCountApi.Text); @@ -344,7 +267,6 @@ namespace OpenTween this.MapThumbnailWidth = int.Parse(this.CooperatePanel.MapThumbnailWidthTextBox.Text); this.MapThumbnailZoom = int.Parse(this.CooperatePanel.MapThumbnailZoomTextBox.Text); this.IsRemoveSameEvent = this.NotifyPanel.IsRemoveSameFavEventCheckBox.Checked; - this.IsNotifyUseGrowl = this.PreviewPanel.IsNotifyUseGrowlCheckBox.Checked; } catch(Exception) { @@ -451,49 +373,8 @@ namespace OpenTween } } - switch (NameBalloon) - { - case MyCommon.NameBalloonEnum.None: - this.PreviewPanel.cmbNameBalloon.SelectedIndex = 0; - break; - case MyCommon.NameBalloonEnum.UserID: - this.PreviewPanel.cmbNameBalloon.SelectedIndex = 1; - break; - case MyCommon.NameBalloonEnum.NickName: - this.PreviewPanel.cmbNameBalloon.SelectedIndex = 2; - break; - } - this.GetCountPanel.TextCountApi.Text = CountApi.ToString(); this.GetCountPanel.TextCountApiReply.Text = CountApiReply.ToString(); - this.PreviewPanel.CheckDispUsername.Checked = DispUsername; - switch (DispLatestPost) - { - case MyCommon.DispTitleEnum.None: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 0; - break; - case MyCommon.DispTitleEnum.Ver: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 1; - break; - case MyCommon.DispTitleEnum.Post: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 2; - break; - case MyCommon.DispTitleEnum.UnreadRepCount: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 3; - break; - case MyCommon.DispTitleEnum.UnreadAllCount: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 4; - break; - case MyCommon.DispTitleEnum.UnreadAllRepCount: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 5; - break; - case MyCommon.DispTitleEnum.UnreadCountAllCount: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 6; - break; - case MyCommon.DispTitleEnum.OwnStatus: - this.PreviewPanel.ComboDispTitle.SelectedIndex = 7; - break; - } this.ShortUrlPanel.CheckTinyURL.Checked = TinyUrlResolve; switch (_MyProxyType) { @@ -522,14 +403,12 @@ namespace OpenTween this.ProxyPanel.TextProxyUser.Text = ProxyUser; this.ProxyPanel.TextProxyPassword.Text = ProxyPassword; - this.PreviewPanel.CheckAlwaysTop.Checked = AlwaysTop; this.ShortUrlPanel.CheckAutoConvertUrl.Checked = UrlConvertAuto; this.ShortUrlPanel.ShortenTcoCheck.Checked = ShortenTco; this.ShortUrlPanel.ShortenTcoCheck.Enabled = this.ShortUrlPanel.CheckAutoConvertUrl.Checked; this.CooperatePanel.CheckNicoms.Checked = Nicoms; this.ConnectionPanel.ConnectionTimeOut.Text = DefaultTimeOut.ToString(); - this.PreviewPanel.CheckBalloonLimit.Checked = LimitBalloon; ApplyEventNotifyFlag(EventNotifyEnabled, EventNotifyFlag, IsMyEventNotifyFlag); this.NotifyPanel.CheckForceEventNotify.Checked = ForceEventNotify; @@ -537,46 +416,11 @@ namespace OpenTween this.CooperatePanel.ComboBoxTranslateLanguage.SelectedIndex = Bing.GetIndexFromLanguageEnum(TranslateLanguage); SoundFileListup(); this.ShortUrlPanel.ComboBoxAutoShortUrlFirst.SelectedIndex = (int)AutoShortUrlFirst; - this.PreviewPanel.chkTabIconDisp.Checked = TabIconDisp; - this.PreviewPanel.CheckMonospace.Checked = IsMonospace; this.ShortUrlPanel.TextBitlyId.Text = BitlyUser; this.ShortUrlPanel.TextBitlyPw.Text = BitlyPwd; this.ShortUrlPanel.TextBitlyId.Modified = false; this.ShortUrlPanel.TextBitlyPw.Modified = false; - this.PreviewPanel.CheckPreviewEnable.Checked = PreviewEnable; - this.PreviewPanel.CheckStatusAreaAtBottom.Checked = StatusAreaAtBottom; this.ConnectionPanel.TwitterAPIText.Text = TwitterApiUrl; - switch (ReplyIconState) - { - case MyCommon.REPLY_ICONSTATE.None: - this.PreviewPanel.ReplyIconStateCombo.SelectedIndex = 0; - break; - case MyCommon.REPLY_ICONSTATE.StaticIcon: - this.PreviewPanel.ReplyIconStateCombo.SelectedIndex = 1; - break; - case MyCommon.REPLY_ICONSTATE.BlinkIcon: - this.PreviewPanel.ReplyIconStateCombo.SelectedIndex = 2; - break; - } - switch (Language) - { - case "OS": - this.PreviewPanel.LanguageCombo.SelectedIndex = 0; - break; - case "ja": - this.PreviewPanel.LanguageCombo.SelectedIndex = 1; - break; - case "en": - this.PreviewPanel.LanguageCombo.SelectedIndex = 2; - break; - case "zh-CN": - this.PreviewPanel.LanguageCombo.SelectedIndex = 3; - break; - default: - this.PreviewPanel.LanguageCombo.SelectedIndex = 0; - break; - } - this.PreviewPanel.ChkNewMentionsBlink.Checked = BlinkNewMentions; this.GetCountPanel.GetMoreTextCountApi.Text = MoreCountApi.ToString(); this.GetCountPanel.FirstTextCountApi.Text = FirstCountApi.ToString(); @@ -605,16 +449,6 @@ namespace OpenTween this.CooperatePanel.MapThumbnailWidthTextBox.Text = this.MapThumbnailWidth.ToString(); this.CooperatePanel.MapThumbnailZoomTextBox.Text = this.MapThumbnailZoom.ToString(); this.NotifyPanel.IsRemoveSameFavEventCheckBox.Checked = this.IsRemoveSameEvent; - this.PreviewPanel.IsNotifyUseGrowlCheckBox.Checked = this.IsNotifyUseGrowl; - - if (GrowlHelper.IsDllExists) - { - this.PreviewPanel.IsNotifyUseGrowlCheckBox.Enabled = true; - } - else - { - this.PreviewPanel.IsNotifyUseGrowlCheckBox.Enabled = false; - } this.TreeViewSetting.Nodes["BasedNode"].Tag = BasedPanel; this.TreeViewSetting.Nodes["BasedNode"].Nodes["PeriodNode"].Tag = GetPeriodPanel; @@ -823,7 +657,6 @@ namespace OpenTween } } - public MyCommon.NameBalloonEnum NameBalloon { get; set; } public int CountApi { get; set; } public int CountApiReply { get; set; } public int MoreCountApi { get; set; } @@ -833,8 +666,6 @@ namespace OpenTween public int UserTimelineCountApi { get; set; } public int ListCountApi { get; set; } public string RecommendStatusText { get; set; } - public bool DispUsername { get; set; } - public MyCommon.DispTitleEnum DispLatestPost { get; set; } public bool TinyUrlResolve { get; set; } public ProxyType SelectedProxyType @@ -851,24 +682,16 @@ namespace OpenTween public int ProxyPort { get; set; } public string ProxyUser { get; set; } public string ProxyPassword { get; set; } - public bool AlwaysTop { get; set; } public bool UrlConvertAuto { get; set; } public bool ShortenTco { get; set; } public bool Nicoms { get; set; } public MyCommon.UrlConverter AutoShortUrlFirst { get; set; } public int DefaultTimeOut { get; set; } - public bool TabIconDisp { get; set; } - public MyCommon.REPLY_ICONSTATE ReplyIconState { get; set; } - public bool IsMonospace { get; set; } public string BitlyUser { get; set; } public string BitlyPwd { get; set; } - public bool PreviewEnable { get; set; } - public bool StatusAreaAtBottom { get; set; } public bool UseAdditionalCount { get; set; } public string TwitterApiUrl { get; set; } - public string Language { get; set; } - public bool LimitBalloon { get; set; } public bool EventNotifyEnabled { get; set; } public MyCommon.EVENTTYPE EventNotifyFlag @@ -1042,7 +865,7 @@ namespace OpenTween Thread.Sleep(10); if (this.Disposing || this.IsDisposed) return; } while (!this.IsHandleCreated); - this.TopMost = this.AlwaysTop; + this.TopMost = this.PreviewPanel.CheckAlwaysTop.Checked; this.GetPeriodPanel.LabelPostAndGet.Visible = this.GetPeriodPanel.CheckPostAndGet.Checked && !tw.UserStreamEnabled; this.GetPeriodPanel.LabelUserStreamActive.Visible = tw.UserStreamEnabled; @@ -1093,8 +916,6 @@ namespace OpenTween _ValidationError = false; } - public bool BlinkNewMentions; - //private void CheckEventNotify_CheckedChanged(object sender, EventArgs e) // Handles CheckEventNotify.CheckedChanged, CheckFavoritesEvent.CheckStateChanged, // CheckUnfavoritesEvent.CheckStateChanged, CheckFollowEvent.CheckStateChanged, diff --git a/OpenTween/EventViewerDialog.cs b/OpenTween/EventViewerDialog.cs index d8e6c581..244a0412 100644 --- a/OpenTween/EventViewerDialog.cs +++ b/OpenTween/EventViewerDialog.cs @@ -87,7 +87,7 @@ namespace OpenTween _curTab = TabEventType.SelectedTab; CreateFilterdEventSource(); EventList.EndUpdate(); - this.TopMost = AppendSettingDialog.Instance.AlwaysTop; + this.TopMost = SettingCommon.Instance.AlwaysTop; } private void EventList_DoubleClick(object sender, EventArgs e) @@ -261,7 +261,7 @@ namespace OpenTween } } } - this.TopMost = AppendSettingDialog.Instance.AlwaysTop; + this.TopMost = SettingCommon.Instance.AlwaysTop; } private void SaveEventLog(List source, StreamWriter sw) diff --git a/OpenTween/Setting/Panel/PreviewPanel.cs b/OpenTween/Setting/Panel/PreviewPanel.cs index 6a2d9b94..384c24a0 100644 --- a/OpenTween/Setting/Panel/PreviewPanel.cs +++ b/OpenTween/Setting/Panel/PreviewPanel.cs @@ -41,5 +41,182 @@ namespace OpenTween.Setting.Panel { InitializeComponent(); } + + public void LoadConfig(SettingCommon settingCommon) + { + switch (settingCommon.NameBalloon) + { + case MyCommon.NameBalloonEnum.None: + this.cmbNameBalloon.SelectedIndex = 0; + break; + case MyCommon.NameBalloonEnum.UserID: + this.cmbNameBalloon.SelectedIndex = 1; + break; + case MyCommon.NameBalloonEnum.NickName: + this.cmbNameBalloon.SelectedIndex = 2; + break; + } + + this.CheckDispUsername.Checked = settingCommon.DispUsername; + + switch (settingCommon.DispLatestPost) + { + case MyCommon.DispTitleEnum.None: + this.ComboDispTitle.SelectedIndex = 0; + break; + case MyCommon.DispTitleEnum.Ver: + this.ComboDispTitle.SelectedIndex = 1; + break; + case MyCommon.DispTitleEnum.Post: + this.ComboDispTitle.SelectedIndex = 2; + break; + case MyCommon.DispTitleEnum.UnreadRepCount: + this.ComboDispTitle.SelectedIndex = 3; + break; + case MyCommon.DispTitleEnum.UnreadAllCount: + this.ComboDispTitle.SelectedIndex = 4; + break; + case MyCommon.DispTitleEnum.UnreadAllRepCount: + this.ComboDispTitle.SelectedIndex = 5; + break; + case MyCommon.DispTitleEnum.UnreadCountAllCount: + this.ComboDispTitle.SelectedIndex = 6; + break; + case MyCommon.DispTitleEnum.OwnStatus: + this.ComboDispTitle.SelectedIndex = 7; + break; + } + + this.CheckAlwaysTop.Checked = settingCommon.AlwaysTop; + this.CheckBalloonLimit.Checked = settingCommon.LimitBalloon; + this.chkTabIconDisp.Checked = settingCommon.TabIconDisp; + this.CheckMonospace.Checked = settingCommon.IsMonospace; + this.CheckPreviewEnable.Checked = settingCommon.PreviewEnable; + this.CheckStatusAreaAtBottom.Checked = settingCommon.StatusAreaAtBottom; + + switch (settingCommon.ReplyIconState) + { + case MyCommon.REPLY_ICONSTATE.None: + this.ReplyIconStateCombo.SelectedIndex = 0; + break; + case MyCommon.REPLY_ICONSTATE.StaticIcon: + this.ReplyIconStateCombo.SelectedIndex = 1; + break; + case MyCommon.REPLY_ICONSTATE.BlinkIcon: + this.ReplyIconStateCombo.SelectedIndex = 2; + break; + } + + switch (settingCommon.Language) + { + case "OS": + this.LanguageCombo.SelectedIndex = 0; + break; + case "ja": + this.LanguageCombo.SelectedIndex = 1; + break; + case "en": + this.LanguageCombo.SelectedIndex = 2; + break; + case "zh-CN": + this.LanguageCombo.SelectedIndex = 3; + break; + default: + this.LanguageCombo.SelectedIndex = 0; + break; + } + + this.ChkNewMentionsBlink.Checked = settingCommon.BlinkNewMentions; + this.IsNotifyUseGrowlCheckBox.Checked = settingCommon.IsUseNotifyGrowl; + this.IsNotifyUseGrowlCheckBox.Enabled = GrowlHelper.IsDllExists; + } + + public void SaveConfig(SettingCommon settingCommon) + { + switch (this.cmbNameBalloon.SelectedIndex) + { + case 0: + settingCommon.NameBalloon = MyCommon.NameBalloonEnum.None; + break; + case 1: + settingCommon.NameBalloon = MyCommon.NameBalloonEnum.UserID; + break; + case 2: + settingCommon.NameBalloon = MyCommon.NameBalloonEnum.NickName; + break; + } + + settingCommon.DispUsername = this.CheckDispUsername.Checked; + + switch (this.ComboDispTitle.SelectedIndex) + { + case 0: // None + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.None; + break; + case 1: // Ver + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.Ver; + break; + case 2: // Post + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.Post; + break; + case 3: // RepCount + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.UnreadRepCount; + break; + case 4: // AllCount + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.UnreadAllCount; + break; + case 5: // Rep+All + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.UnreadAllRepCount; + break; + case 6: // Unread/All + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.UnreadCountAllCount; + break; + case 7: // Count of Status/Follow/Follower + settingCommon.DispLatestPost = MyCommon.DispTitleEnum.OwnStatus; + break; + } + + settingCommon.AlwaysTop = this.CheckAlwaysTop.Checked; + settingCommon.LimitBalloon = this.CheckBalloonLimit.Checked; + settingCommon.TabIconDisp = this.chkTabIconDisp.Checked; + settingCommon.IsMonospace = this.CheckMonospace.Checked; + settingCommon.PreviewEnable = this.CheckPreviewEnable.Checked; + settingCommon.StatusAreaAtBottom = this.CheckStatusAreaAtBottom.Checked; + + switch (this.ReplyIconStateCombo.SelectedIndex) + { + case 0: + settingCommon.ReplyIconState = MyCommon.REPLY_ICONSTATE.None; + break; + case 1: + settingCommon.ReplyIconState = MyCommon.REPLY_ICONSTATE.StaticIcon; + break; + case 2: + settingCommon.ReplyIconState = MyCommon.REPLY_ICONSTATE.BlinkIcon; + break; + } + + switch (this.LanguageCombo.SelectedIndex) + { + case 0: + settingCommon.Language = "OS"; + break; + case 1: + settingCommon.Language = "ja"; + break; + case 2: + settingCommon.Language = "en"; + break; + case 3: + settingCommon.Language = "zh-CN"; + break; + default: + settingCommon.Language = "en"; + break; + } + + settingCommon.BlinkNewMentions = this.ChkNewMentionsBlink.Checked; + settingCommon.IsUseNotifyGrowl = this.IsNotifyUseGrowlCheckBox.Checked; + } } } diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs index d5025b21..0713505e 100644 --- a/OpenTween/Tween.cs +++ b/OpenTween/Tween.cs @@ -770,16 +770,12 @@ namespace OpenTween this.PlaySoundMenuItem.Checked = this._cfgCommon.PlaySound; this.PlaySoundFileMenuItem.Checked = this._cfgCommon.PlaySound; - SettingDialog.NameBalloon = _cfgCommon.NameBalloon; - SettingDialog.CountApi = _cfgCommon.CountApi; SettingDialog.CountApiReply = _cfgCommon.CountApiReply; if (SettingDialog.CountApi < 20 || SettingDialog.CountApi > 200) SettingDialog.CountApi = 60; if (SettingDialog.CountApiReply < 20 || SettingDialog.CountApiReply > 200) SettingDialog.CountApiReply = 40; SettingDialog.PostAndGet = _cfgCommon.PostAndGet; - SettingDialog.DispUsername = _cfgCommon.DispUsername; - SettingDialog.DispLatestPost = _cfgCommon.DispLatestPost; SettingDialog.TinyUrlResolve = _cfgCommon.TinyUrlResolve; SettingDialog.SelectedProxyType = _cfgLocal.ProxyType; @@ -788,12 +784,10 @@ namespace OpenTween SettingDialog.ProxyUser = _cfgLocal.ProxyUser; SettingDialog.ProxyPassword = _cfgLocal.ProxyPassword; - SettingDialog.AlwaysTop = _cfgCommon.AlwaysTop; SettingDialog.UrlConvertAuto = false; //SettingDialog.UrlConvertAuto = _cfgCommon.UrlConvertAuto; SettingDialog.DefaultTimeOut = _cfgCommon.DefaultTimeOut; - SettingDialog.LimitBalloon = _cfgCommon.LimitBalloon; SettingDialog.EventNotifyEnabled = _cfgCommon.EventNotifyEnabled; SettingDialog.EventNotifyFlag = _cfgCommon.EventNotifyFlag; SettingDialog.IsMyEventNotifyFlag = _cfgCommon.IsMyEventNotifyFlag; @@ -807,17 +801,10 @@ namespace OpenTween _cfgCommon.AutoShortUrlFirst = MyCommon.UrlConverter.Uxnu; SettingDialog.AutoShortUrlFirst = _cfgCommon.AutoShortUrlFirst; - SettingDialog.TabIconDisp = _cfgCommon.TabIconDisp; - SettingDialog.ReplyIconState = _cfgCommon.ReplyIconState; SettingDialog.BitlyUser = _cfgCommon.BilyUser; SettingDialog.BitlyPwd = _cfgCommon.BitlyPwd; - SettingDialog.Language = _cfgCommon.Language; - SettingDialog.PreviewEnable = _cfgCommon.PreviewEnable; - SettingDialog.StatusAreaAtBottom = _cfgCommon.StatusAreaAtBottom; AtIdSupl = new AtIdSupplement(SettingAtIdList.Load().AtIdList, "@"); - SettingDialog.IsMonospace = _cfgCommon.IsMonospace; - this.IdeographicSpaceToSpaceToolStripMenuItem.Checked = _cfgCommon.WideSpaceConvert; this.ToolStripFocusLockMenuItem.Checked = _cfgCommon.FocusLockToStatusText; @@ -826,8 +813,6 @@ namespace OpenTween SettingDialog.Nicoms = _cfgCommon.Nicoms; - SettingDialog.BlinkNewMentions = _cfgCommon.BlinkNewMentions; - SettingDialog.UseAdditionalCount = _cfgCommon.UseAdditionalCount; SettingDialog.MoreCountApi = _cfgCommon.MoreCountApi; SettingDialog.FirstCountApi = _cfgCommon.FirstCountApi; @@ -845,7 +830,6 @@ namespace OpenTween SettingDialog.MapThumbnailWidth = _cfgCommon.MapThumbnailWidth; SettingDialog.MapThumbnailZoom = _cfgCommon.MapThumbnailZoom; SettingDialog.IsRemoveSameEvent = _cfgCommon.IsRemoveSameEvent; - SettingDialog.IsNotifyUseGrowl = _cfgCommon.IsUseNotifyGrowl; //ハッシュタグ関連 HashSupl = new AtIdSupplement(_cfgCommon.HashTags, "#"); @@ -989,7 +973,7 @@ namespace OpenTween } } } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; _mySpDis = _cfgLocal.SplitterDistance; _mySpDis2 = _cfgLocal.StatusTextHeight; _mySpDis3 = _cfgLocal.PreviewDistance; @@ -1011,7 +995,7 @@ namespace OpenTween this.NameLabel.Font = this.ReplaceToGlobalFont(this.NameLabel.Font); // 必要であれば、発言一覧と発言詳細部・入力欄の上下を入れ替える - SplitContainer1.IsPanelInverted = !SettingDialog.StatusAreaAtBottom; + SplitContainer1.IsPanelInverted = !this._cfgCommon.StatusAreaAtBottom; //全新着通知のチェック状態により、Reply&DMの新着通知有効無効切り替え(タブ別設定にするため削除予定) if (this._cfgCommon.UnreadManage == false) @@ -1020,7 +1004,8 @@ namespace OpenTween UnreadStripMenuItem.Enabled = false; } - if (SettingDialog.IsNotifyUseGrowl) gh.RegisterGrowl(); + if (this._cfgCommon.IsUseNotifyGrowl) + gh.RegisterGrowl(); //タイマー設定 TimerTimeline.AutoReset = true; @@ -1153,7 +1138,7 @@ namespace OpenTween SetMainWindowTitle(); SetNotifyIconText(); - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { ListTab.DrawMode = TabDrawMode.Normal; } @@ -1201,7 +1186,7 @@ namespace OpenTween private void InitDetailHtmlFormat() { - if (SettingDialog.IsMonospace) + if (this._cfgCommon.IsMonospace) { detailHtmlFormatHeader = detailHtmlFormatMono1; detailHtmlFormatFooter = detailHtmlFormatMono7; @@ -1212,7 +1197,7 @@ namespace OpenTween detailHtmlFormatFooter = detailHtmlFormat7; } detailHtmlFormatHeader += _fntDetail.Name + detailHtmlFormat2 + _fntDetail.Size.ToString() + detailHtmlFormat3 + _clDetail.R.ToString() + "," + _clDetail.G.ToString() + "," + _clDetail.B.ToString() + detailHtmlFormat4 + _clDetailLink.R.ToString() + "," + _clDetailLink.G.ToString() + "," + _clDetailLink.B.ToString() + detailHtmlFormat5 + _clDetailBackcolor.R.ToString() + "," + _clDetailBackcolor.G.ToString() + "," + _clDetailBackcolor.B.ToString(); - if (SettingDialog.IsMonospace) + if (this._cfgCommon.IsMonospace) { detailHtmlFormatHeader += detailHtmlFormatMono6; } @@ -1448,10 +1433,10 @@ namespace OpenTween } } if (tabInfo.UnreadCount > 0) - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) if (tab.ImageIndex == -1) tab.ImageIndex = 0; //タブアイコン } - if (!SettingDialog.TabIconDisp) ListTab.Refresh(); + if (!this._cfgCommon.TabIconDisp) ListTab.Refresh(); } catch (Exception) { @@ -1640,14 +1625,14 @@ namespace OpenTween !_initial && ( ( - SettingDialog.LimitBalloon && + this._cfgCommon.LimitBalloon && ( this.WindowState == FormWindowState.Minimized || !this.Visible || Form.ActiveForm == null ) ) || - !SettingDialog.LimitBalloon + !this._cfgCommon.LimitBalloon ) ) && !NativeMethods.IsScreenSaverRunning()) @@ -1676,7 +1661,7 @@ namespace OpenTween if (notifyPosts != null && notifyPosts.Length > 0) { //Growlは一個ずつばらして通知。ただし、3ポスト以上あるときはまとめる - if (SettingDialog.IsNotifyUseGrowl) + if (this._cfgCommon.IsUseNotifyGrowl) { StringBuilder sb = new StringBuilder(); bool reply = false; @@ -1693,7 +1678,7 @@ namespace OpenTween if (post.IsReply && !post.IsExcludeReply) reply = true; if (post.IsDm) dm = true; if (sb.Length > 0) sb.Append(System.Environment.NewLine); - switch (SettingDialog.NameBalloon) + switch (this._cfgCommon.NameBalloon) { case MyCommon.NameBalloonEnum.UserID: sb.Append(post.ScreenName).Append(" : "); @@ -1710,7 +1695,7 @@ namespace OpenTween StringBuilder title = new StringBuilder(); GrowlHelper.NotifyType nt; - if (SettingDialog.DispUsername) + if (this._cfgCommon.DispUsername) { title.Append(tw.Username); title.Append(" - "); @@ -1772,7 +1757,7 @@ namespace OpenTween if (post.IsReply && !post.IsExcludeReply) reply = true; if (post.IsDm) dm = true; if (sb.Length > 0) sb.Append(System.Environment.NewLine); - switch (SettingDialog.NameBalloon) + switch (this._cfgCommon.NameBalloon) { case MyCommon.NameBalloonEnum.UserID: sb.Append(post.ScreenName).Append(" : "); @@ -1787,7 +1772,7 @@ namespace OpenTween //if (SettingDialog.DispUsername) { NotifyIcon1.BalloonTipTitle = tw.Username + " - "; } else { NotifyIcon1.BalloonTipTitle = ""; } StringBuilder title = new StringBuilder(); ToolTipIcon ntIcon; - if (SettingDialog.DispUsername) + if (this._cfgCommon.DispUsername) { title.Append(tw.Username); title.Append(" - "); @@ -1865,7 +1850,7 @@ namespace OpenTween } //mentions新着時に画面ブリンク - if (!_initial && SettingDialog.BlinkNewMentions && newMentions && Form.ActiveForm == null) + if (!_initial && this._cfgCommon.BlinkNewMentions && newMentions && Form.ActiveForm == null) { NativeMethods.FlashMyWindow(this.Handle, NativeMethods.FlashSpecification.FlashTray, 3); } @@ -3654,13 +3639,13 @@ namespace OpenTween } if (_statuses.Tabs[tb.Text].UnreadCount == 0) { - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { if (tb.ImageIndex == 0) tb.ImageIndex = -1; //タブアイコン } } } - if (!SettingDialog.TabIconDisp) ListTab.Refresh(); + if (!this._cfgCommon.TabIconDisp) ListTab.Refresh(); } finally { @@ -3694,13 +3679,13 @@ namespace OpenTween { if (_statuses.Tabs[tb.Text].UnreadCount == 0) { - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { if (tb.ImageIndex == 0) tb.ImageIndex = -1; //タブアイコン } } } - if (!SettingDialog.TabIconDisp) ListTab.Refresh(); + if (!this._cfgCommon.TabIconDisp) ListTab.Refresh(); } private void UnreadStripMenuItem_Click(object sender, EventArgs e) @@ -3724,13 +3709,13 @@ namespace OpenTween { if (_statuses.Tabs[tb.Text].UnreadCount > 0) { - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { if (tb.ImageIndex == -1) tb.ImageIndex = 0; //タブアイコン } } } - if (!SettingDialog.TabIconDisp) ListTab.Refresh(); + if (!this._cfgCommon.TabIconDisp) ListTab.Refresh(); } private void RefreshStripMenuItem_Click(object sender, EventArgs e) @@ -3864,7 +3849,7 @@ namespace OpenTween try { - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { ListTab.DrawItem -= ListTab_DrawItem; ListTab.DrawMode = TabDrawMode.Normal; @@ -3891,7 +3876,7 @@ namespace OpenTween { ReadedStripMenuItem.Enabled = false; UnreadStripMenuItem.Enabled = false; - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { foreach (TabPage myTab in ListTab.TabPages) { @@ -3915,7 +3900,7 @@ namespace OpenTween // タブの表示位置の決定 SetTabAlignment(); - SplitContainer1.IsPanelInverted = !SettingDialog.StatusAreaAtBottom; + SplitContainer1.IsPanelInverted = !this._cfgCommon.StatusAreaAtBottom; var imgazyobizinet = ThumbnailGenerator.ImgAzyobuziNetInstance; imgazyobizinet.Enabled = this.SettingDialog.EnableImgAzyobuziNet; @@ -3996,7 +3981,7 @@ namespace OpenTween { foreach (TabPage tb in ListTab.TabPages) { - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { if (_statuses.Tabs[tb.Text].UnreadCount == 0) tb.ImageIndex = -1; @@ -4067,7 +4052,7 @@ namespace OpenTween if (uid != tw.Username) this.doGetFollowersMenu(); - if (SettingDialog.IsNotifyUseGrowl) gh.RegisterGrowl(); + if (this._cfgCommon.IsUseNotifyGrowl) gh.RegisterGrowl(); try { StatusText_TextChanged(null, null); @@ -4080,7 +4065,7 @@ namespace OpenTween Twitter.AccountState = MyCommon.ACCOUNT_STATE.Valid; - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; SaveConfigsAll(false); } @@ -4822,7 +4807,7 @@ namespace OpenTween { dialog.ShowDialog(); } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; int selStart = owner.SelectionStart; string fHalf = ""; string eHalf = ""; @@ -5177,7 +5162,7 @@ namespace OpenTween var listview = (DetailsListView)tabPage.Tag; listview.VirtualListSize = tab.AllCount; - if (this.SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { if (tab.UnreadCount > 0) tabPage.ImageIndex = 0; @@ -5186,7 +5171,7 @@ namespace OpenTween } } - if (!this.SettingDialog.TabIconDisp) + if (!this._cfgCommon.TabIconDisp) this.ListTab.Refresh(); } finally @@ -5662,10 +5647,10 @@ namespace OpenTween if (this.SearchDialog.ShowDialog(this) != DialogResult.OK) { - this.TopMost = this.SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; return; } - this.TopMost = this.SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; var searchOptions = this.SearchDialog.ResultOptions; if (searchOptions.Type == SearchWordDialog.SearchType.Timeline) @@ -5724,7 +5709,7 @@ namespace OpenTween { about.ShowDialog(this); } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; } private void JumpUnreadMenuItem_Click(object sender, EventArgs e) @@ -5929,10 +5914,10 @@ namespace OpenTween _colorize = false; DispSelectedPost(); //件数関連の場合、タイトル即時書き換え - if (SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.None && - SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.Post && - SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.Ver && - SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.OwnStatus) + if (this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.None && + this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.Post && + this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.Ver && + this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.OwnStatus) { SetMainWindowTitle(); } @@ -5941,13 +5926,13 @@ namespace OpenTween { if (_statuses.Tabs[tb.Text].UnreadCount == 0) { - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { if (tb.ImageIndex == 0) tb.ImageIndex = -1; } } } - if (!SettingDialog.TabIconDisp) ListTab.Refresh(); + if (!this._cfgCommon.TabIconDisp) ListTab.Refresh(); } public string createDetailHtml(string orgdata) @@ -6134,7 +6119,7 @@ namespace OpenTween this.SplitContainer3.Panel2Collapsed = true; - if (this.IsPreviewEnable) + if (this._cfgCommon.PreviewEnable) { if (this.thumbnailTokenSource != null) { @@ -7692,16 +7677,11 @@ namespace OpenTween _cfgCommon.TokenSecret = tw.AccessTokenSecret; _cfgCommon.UserAccounts = SettingDialog.UserAccounts; - _cfgCommon.NameBalloon = SettingDialog.NameBalloon; _cfgCommon.CountApi = SettingDialog.CountApi; _cfgCommon.CountApiReply = SettingDialog.CountApiReply; - _cfgCommon.DispUsername = SettingDialog.DispUsername; - _cfgCommon.DispLatestPost = SettingDialog.DispLatestPost; _cfgCommon.TinyUrlResolve = SettingDialog.TinyUrlResolve; - _cfgCommon.AlwaysTop = SettingDialog.AlwaysTop; _cfgCommon.UrlConvertAuto = SettingDialog.UrlConvertAuto; _cfgCommon.DefaultTimeOut = SettingDialog.DefaultTimeOut; - _cfgCommon.LimitBalloon = SettingDialog.LimitBalloon; _cfgCommon.EventNotifyEnabled = SettingDialog.EventNotifyEnabled; _cfgCommon.EventNotifyFlag = SettingDialog.EventNotifyFlag; _cfgCommon.IsMyEventNotifyFlag = SettingDialog.IsMyEventNotifyFlag; @@ -7710,9 +7690,6 @@ namespace OpenTween _cfgCommon.TranslateLanguage = SettingDialog.TranslateLanguage; _cfgCommon.EventSoundFile = SettingDialog.EventSoundFile; _cfgCommon.AutoShortUrlFirst = SettingDialog.AutoShortUrlFirst; - _cfgCommon.TabIconDisp = SettingDialog.TabIconDisp; - _cfgCommon.ReplyIconState = SettingDialog.ReplyIconState; - _cfgCommon.IsMonospace = SettingDialog.IsMonospace; if (IdeographicSpaceToSpaceToolStripMenuItem != null && IdeographicSpaceToSpaceToolStripMenuItem.IsDisposed == false) { @@ -7720,9 +7697,6 @@ namespace OpenTween } _cfgCommon.BilyUser = SettingDialog.BitlyUser; _cfgCommon.BitlyPwd = SettingDialog.BitlyPwd; - _cfgCommon.PreviewEnable = SettingDialog.PreviewEnable; - _cfgCommon.StatusAreaAtBottom = SettingDialog.StatusAreaAtBottom; - _cfgCommon.Language = SettingDialog.Language; _cfgCommon.SortOrder = (int)_statuses.SortOrder; switch (_statuses.SortMode) @@ -7758,7 +7732,6 @@ namespace OpenTween _cfgCommon.HashIsPermanent = HashMgr.IsPermanent; _cfgCommon.HashIsNotAddToAtReply = HashMgr.IsNotAddToAtReply; _cfgCommon.TwitterUrl = SettingDialog.TwitterApiUrl; - _cfgCommon.BlinkNewMentions = SettingDialog.BlinkNewMentions; if (ToolStripFocusLockMenuItem != null && ToolStripFocusLockMenuItem.IsDisposed == false) { @@ -7783,7 +7756,6 @@ namespace OpenTween _cfgCommon.MapThumbnailWidth = SettingDialog.MapThumbnailWidth; _cfgCommon.MapThumbnailZoom = SettingDialog.MapThumbnailZoom; _cfgCommon.IsRemoveSameEvent = SettingDialog.IsRemoveSameEvent; - _cfgCommon.IsUseNotifyGrowl = SettingDialog.IsNotifyUseGrowl; _cfgCommon.Save(); } @@ -7952,7 +7924,7 @@ namespace OpenTween } } } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; } private void PostBrowser_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) @@ -7976,7 +7948,7 @@ namespace OpenTween if (inputName.DialogResult == DialogResult.Cancel) return false; newTabText = inputName.TabName; } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; if (!string.IsNullOrEmpty(newTabText)) { //新タブ名存在チェック @@ -8517,11 +8489,11 @@ namespace OpenTween } TabClass tb = _statuses.GetTabByType(MyCommon.TabUsageType.Mentions); - if (SettingDialog.ReplyIconState != MyCommon.REPLY_ICONSTATE.None && tb != null && tb.UnreadCount > 0) + if (this._cfgCommon.ReplyIconState != MyCommon.REPLY_ICONSTATE.None && tb != null && tb.UnreadCount > 0) { if (blinkCnt > 0) return; blink = !blink; - if (blink || SettingDialog.ReplyIconState == MyCommon.REPLY_ICONSTATE.StaticIcon) + if (blink || this._cfgCommon.ReplyIconState == MyCommon.REPLY_ICONSTATE.StaticIcon) { NotifyIcon1.Icon = ReplyIcon; } @@ -8674,7 +8646,7 @@ namespace OpenTween } _statuses.SetTabUnreadManage(tabName, isManage); - if (SettingDialog.TabIconDisp) + if (this._cfgCommon.TabIconDisp) { if (_statuses.Tabs[tabName].UnreadCount > 0) ListTab.TabPages[idx].ImageIndex = 0; @@ -8690,7 +8662,7 @@ namespace OpenTween SetMainWindowTitle(); SetStatusLabelUrl(); - if (!SettingDialog.TabIconDisp) ListTab.Refresh(); + if (!this._cfgCommon.TabIconDisp) ListTab.Refresh(); } private void NotifyDispMenuItem_Click(object sender, EventArgs e) @@ -8727,7 +8699,7 @@ namespace OpenTween if (string.IsNullOrEmpty(_rclickTabName)) _rclickTabName = _statuses.GetTabByType(MyCommon.TabUsageType.Home).TabName; fltDialog.SetCurrent(_rclickTabName); fltDialog.ShowDialog(this); - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; this.ApplyPostFilters(); SaveConfigsTabs(); @@ -8746,7 +8718,7 @@ namespace OpenTween tabName = inputName.TabName; tabUsage = inputName.Usage; } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; if (!string.IsNullOrEmpty(tabName)) { //List対応 @@ -8804,7 +8776,7 @@ namespace OpenTween fltDialog.AddNewFilter(_statuses[_curTab.Text, idx].RetweetedBy, _statuses[_curTab.Text, idx].TextFromApi); } fltDialog.ShowDialog(this); - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; } this.ApplyPostFilters(); @@ -8985,7 +8957,7 @@ namespace OpenTween if (inputName.DialogResult == DialogResult.Cancel) return false; tabName = inputName.TabName; } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; if (!string.IsNullOrEmpty(tabName)) { if (!_statuses.AddTab(tabName, MyCommon.TabUsageType.UserDefined, null) || !AddNewTab(tabName, false, MyCommon.TabUsageType.UserDefined)) @@ -9153,7 +9125,7 @@ namespace OpenTween { return; } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; } if (string.IsNullOrEmpty(openUrlStr)) return; @@ -9215,7 +9187,7 @@ namespace OpenTween break; } } - if (!SettingDialog.TabIconDisp) ListTab.Refresh(); + if (!this._cfgCommon.TabIconDisp) ListTab.Refresh(); SetMainWindowTitle(); SetStatusLabelUrl(); @@ -9229,10 +9201,10 @@ namespace OpenTween StringBuilder ttl = new StringBuilder(256); int ur = 0; int al = 0; - if (SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.None && - SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.Post && - SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.Ver && - SettingDialog.DispLatestPost != MyCommon.DispTitleEnum.OwnStatus) + if (this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.None && + this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.Post && + this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.Ver && + this._cfgCommon.DispLatestPost != MyCommon.DispTitleEnum.OwnStatus) { foreach (var tab in _statuses.Tabs.Values) { @@ -9241,10 +9213,10 @@ namespace OpenTween } } - if (SettingDialog.DispUsername) ttl.Append(tw.Username).Append(" - "); + if (this._cfgCommon.DispUsername) ttl.Append(tw.Username).Append(" - "); ttl.Append(Application.ProductName); ttl.Append(" "); - switch (SettingDialog.DispLatestPost) + switch (this._cfgCommon.DispLatestPost) { case MyCommon.DispTitleEnum.Ver: ttl.Append("Ver:").Append(MyCommon.GetReadableVersion()); @@ -9372,7 +9344,7 @@ namespace OpenTween // タスクトレイアイコンのツールチップテキスト書き換え // Tween [未読/@] ur.Remove(0, ur.Length); - if (SettingDialog.DispUsername) + if (this._cfgCommon.DispUsername) { ur.Append(tw.Username); ur.Append(" - "); @@ -11733,7 +11705,7 @@ namespace OpenTween { return; } - this.TopMost = SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; if (rslt == DialogResult.Cancel) return; if (!string.IsNullOrEmpty(HashMgr.UseHash)) { @@ -12252,11 +12224,6 @@ namespace OpenTween get { return _curPost; } } - public bool IsPreviewEnable - { - get { return SettingDialog.PreviewEnable; } - } - #region "画像投稿" private void ImageSelectMenuItem_Click(object sender, EventArgs e) { @@ -12677,7 +12644,7 @@ namespace OpenTween //if (SettingDialog.DispUsername) NotifyIcon1.BalloonTipTitle = tw.Username + " - "; else NotifyIcon1.BalloonTipTitle = ""; //NotifyIcon1.BalloonTipTitle += Application.ProductName + " [" + ev.Event.ToUpper() + "] by " + ((string)(!string.IsNullOrEmpty(ev.Username) ? ev.Username : ""), string); StringBuilder title = new StringBuilder(); - if (SettingDialog.DispUsername) + if (this._cfgCommon.DispUsername) { title.Append(tw.Username); title.Append(" - "); @@ -12710,7 +12677,7 @@ namespace OpenTween text = " "; } //NotifyIcon1.ShowBalloonTip(500); - if (SettingDialog.IsNotifyUseGrowl) + if (this._cfgCommon.IsUseNotifyGrowl) { gh.Notify(GrowlHelper.NotifyType.UserStreamEvent, ev.Id.ToString(), title.ToString(), text); @@ -12830,7 +12797,7 @@ namespace OpenTween { evtDialog.Activate(); } - this.TopMost = this.SettingDialog.AlwaysTop; + this.TopMost = this._cfgCommon.AlwaysTop; } #endregion