GetCountPanelに対する設定値の設定・取得を LoadConfing/SaveConfig メソッドに移動

diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs
index 629a5bd..b19a539 100644 (file)
--- a/OpenTween/AppendSettingDialog.cs
+++ b/OpenTween/AppendSettingDialog.cs
@@ -80,6 +80,7 @@ namespace OpenTween
             this.FontPanel.LoadConfig(settingLocal);
             this.FontPanel2.LoadConfig(settingLocal);
             this.PreviewPanel.LoadConfig(settingCommon);
+            this.GetCountPanel.LoadConfig(settingCommon);
         }
 
         public void SaveConfig(SettingCommon settingCommon, SettingLocal settingLocal)
@@ -92,6 +93,7 @@ namespace OpenTween
             this.FontPanel.SaveConfig(settingLocal);
             this.FontPanel2.SaveConfig(settingLocal);
             this.PreviewPanel.SaveConfig(settingCommon);
+            this.GetCountPanel.SaveConfig(settingCommon);
         }
 
         private void TreeViewSetting_BeforeSelect(object sender, TreeViewCancelEventArgs e)
@@ -217,8 +219,6 @@ namespace OpenTween
 #endif
             try
             {
-                CountApi = int.Parse(this.GetCountPanel.TextCountApi.Text);
-                CountApiReply = int.Parse(this.GetCountPanel.TextCountApiReply.Text);
                 TinyUrlResolve = this.ShortUrlPanel.CheckTinyURL.Checked;
                 ShortUrl.Instance.DisableExpanding = !TinyUrlResolve;
                 if (this.ProxyPanel.RadioProxyNone.Checked)
@@ -252,13 +252,6 @@ namespace OpenTween
                 BitlyUser = this.ShortUrlPanel.TextBitlyId.Text;
                 BitlyPwd = this.ShortUrlPanel.TextBitlyPw.Text;
                 TwitterApiUrl = this.ConnectionPanel.TwitterAPIText.Text.Trim();
-                UseAdditionalCount = this.GetCountPanel.UseChangeGetCount.Checked;
-                MoreCountApi = int.Parse(this.GetCountPanel.GetMoreTextCountApi.Text);
-                FirstCountApi = int.Parse(this.GetCountPanel.FirstTextCountApi.Text);
-                SearchCountApi = int.Parse(this.GetCountPanel.SearchTextCountApi.Text);
-                FavoritesCountApi = int.Parse(this.GetCountPanel.FavoritesTextCountApi.Text);
-                UserTimelineCountApi = int.Parse(this.GetCountPanel.UserTimelineTextCountApi.Text);
-                ListCountApi = int.Parse(this.GetCountPanel.ListTextCountApi.Text);
                 UserAppointUrl = this.CooperatePanel.UserAppointUrlText.Text;
                 this.EnableImgAzyobuziNet = this.CooperatePanel.EnableImgAzyobuziNetCheckBox.Checked;
                 this.ImgAzyobuziNetDisabledInDM = this.CooperatePanel.ImgAzyobuziNetDisabledInDMCheckBox.Checked;
@@ -373,8 +366,6 @@ namespace OpenTween
                 }
             }
 
-            this.GetCountPanel.TextCountApi.Text = CountApi.ToString();
-            this.GetCountPanel.TextCountApiReply.Text = CountApiReply.ToString();
             this.ShortUrlPanel.CheckTinyURL.Checked = TinyUrlResolve;
             switch (_MyProxyType)
             {
@@ -422,25 +413,6 @@ namespace OpenTween
             this.ShortUrlPanel.TextBitlyPw.Modified = false;
             this.ConnectionPanel.TwitterAPIText.Text = TwitterApiUrl;
 
-            this.GetCountPanel.GetMoreTextCountApi.Text = MoreCountApi.ToString();
-            this.GetCountPanel.FirstTextCountApi.Text = FirstCountApi.ToString();
-            this.GetCountPanel.SearchTextCountApi.Text = SearchCountApi.ToString();
-            this.GetCountPanel.FavoritesTextCountApi.Text = FavoritesCountApi.ToString();
-            this.GetCountPanel.UserTimelineTextCountApi.Text = UserTimelineCountApi.ToString();
-            this.GetCountPanel.ListTextCountApi.Text = ListCountApi.ToString();
-            this.GetCountPanel.UseChangeGetCount.Checked = UseAdditionalCount;
-            this.GetCountPanel.Label28.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.Label30.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.Label53.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.Label66.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.Label17.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.Label25.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.GetMoreTextCountApi.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.FirstTextCountApi.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.SearchTextCountApi.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.FavoritesTextCountApi.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.UserTimelineTextCountApi.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
-            this.GetCountPanel.ListTextCountApi.Enabled = this.GetCountPanel.UseChangeGetCount.Checked;
             this.CooperatePanel.UserAppointUrlText.Text = UserAppointUrl;
             this.CooperatePanel.EnableImgAzyobuziNetCheckBox.Checked = this.EnableImgAzyobuziNet;
             this.CooperatePanel.ImgAzyobuziNetDisabledInDMCheckBox.Checked = this.ImgAzyobuziNetDisabledInDM;
@@ -657,14 +629,6 @@ namespace OpenTween
             }
         }
 
-        public int CountApi { get; set; }
-        public int CountApiReply { get; set; }
-        public int MoreCountApi { get; set; }
-        public int FirstCountApi { get; set; }
-        public int SearchCountApi { get; set; }
-        public int FavoritesCountApi { get; set; }
-        public int UserTimelineCountApi { get; set; }
-        public int ListCountApi { get; set; }
         public string RecommendStatusText { get; set; }
         public bool TinyUrlResolve { get; set; }
 
@@ -689,7 +653,6 @@ namespace OpenTween
         public int DefaultTimeOut { get; set; }
         public string BitlyUser { get; set; }
         public string BitlyPwd { get; set; }
-        public bool UseAdditionalCount { get; set; }
         public string TwitterApiUrl { get; set; }
 
         public bool EventNotifyEnabled { get; set; }

diff --git a/OpenTween/Setting/Panel/GetCountPanel.cs b/OpenTween/Setting/Panel/GetCountPanel.cs
index f47cb55..9050377 100644 (file)
--- a/OpenTween/Setting/Panel/GetCountPanel.cs
+++ b/OpenTween/Setting/Panel/GetCountPanel.cs
@@ -42,6 +42,45 @@ namespace OpenTween.Setting.Panel
             InitializeComponent();
         }
 
+        public void LoadConfig(SettingCommon settingCommon)
+        {
+            this.TextCountApi.Text = settingCommon.CountApi.ToString();
+            this.TextCountApiReply.Text = settingCommon.CountApiReply.ToString();
+            this.GetMoreTextCountApi.Text = settingCommon.MoreCountApi.ToString();
+            this.FirstTextCountApi.Text = settingCommon.FirstCountApi.ToString();
+            this.SearchTextCountApi.Text = settingCommon.SearchCountApi.ToString();
+            this.FavoritesTextCountApi.Text = settingCommon.FavoritesCountApi.ToString();
+            this.UserTimelineTextCountApi.Text = settingCommon.UserTimelineCountApi.ToString();
+            this.ListTextCountApi.Text = settingCommon.ListCountApi.ToString();
+            this.UseChangeGetCount.Checked = settingCommon.UseAdditionalCount;
+
+            this.Label28.Enabled = this.UseChangeGetCount.Checked;
+            this.Label30.Enabled = this.UseChangeGetCount.Checked;
+            this.Label53.Enabled = this.UseChangeGetCount.Checked;
+            this.Label66.Enabled = this.UseChangeGetCount.Checked;
+            this.Label17.Enabled = this.UseChangeGetCount.Checked;
+            this.Label25.Enabled = this.UseChangeGetCount.Checked;
+            this.GetMoreTextCountApi.Enabled = this.UseChangeGetCount.Checked;
+            this.FirstTextCountApi.Enabled = this.UseChangeGetCount.Checked;
+            this.SearchTextCountApi.Enabled = this.UseChangeGetCount.Checked;
+            this.FavoritesTextCountApi.Enabled = this.UseChangeGetCount.Checked;
+            this.UserTimelineTextCountApi.Enabled = this.UseChangeGetCount.Checked;
+            this.ListTextCountApi.Enabled = this.UseChangeGetCount.Checked;
+        }
+
+        public void SaveConfig(SettingCommon settingCommon)
+        {
+            settingCommon.CountApi = int.Parse(this.TextCountApi.Text);
+            settingCommon.CountApiReply = int.Parse(this.TextCountApiReply.Text);
+            settingCommon.UseAdditionalCount = this.UseChangeGetCount.Checked;
+            settingCommon.MoreCountApi = int.Parse(this.GetMoreTextCountApi.Text);
+            settingCommon.FirstCountApi = int.Parse(this.FirstTextCountApi.Text);
+            settingCommon.SearchCountApi = int.Parse(this.SearchTextCountApi.Text);
+            settingCommon.FavoritesCountApi = int.Parse(this.FavoritesTextCountApi.Text);
+            settingCommon.UserTimelineCountApi = int.Parse(this.UserTimelineTextCountApi.Text);
+            settingCommon.ListCountApi = int.Parse(this.ListTextCountApi.Text);
+        }
+
         private void TextCountApi_Validating(object sender, CancelEventArgs e)
         {
             int cnt;

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 0713505..dd94862 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -752,6 +752,11 @@ namespace OpenTween
                     this._cfgCommon.ListsPeriod = 15;
             }
 
+            if (this._cfgCommon.CountApi < 20 || this._cfgCommon.CountApi > 200)
+                this._cfgCommon.CountApi = 60;
+            if (this._cfgCommon.CountApiReply < 20 || this._cfgCommon.CountApiReply > 200)
+                this._cfgCommon.CountApiReply = 40;
+
             //設定画面への反映
             this.SettingDialog.LoadConfig(this._cfgCommon, this._cfgLocal);
             HttpTwitter.TwitterUrl = _cfgCommon.TwitterUrl;
@@ -770,12 +775,6 @@ namespace OpenTween
             this.PlaySoundMenuItem.Checked = this._cfgCommon.PlaySound;
             this.PlaySoundFileMenuItem.Checked = this._cfgCommon.PlaySound;
 
-            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.TinyUrlResolve = _cfgCommon.TinyUrlResolve;
 
             SettingDialog.SelectedProxyType = _cfgLocal.ProxyType;
@@ -813,14 +812,6 @@ namespace OpenTween
 
             SettingDialog.Nicoms = _cfgCommon.Nicoms;
 
-            SettingDialog.UseAdditionalCount = _cfgCommon.UseAdditionalCount;
-            SettingDialog.MoreCountApi = _cfgCommon.MoreCountApi;
-            SettingDialog.FirstCountApi = _cfgCommon.FirstCountApi;
-            SettingDialog.SearchCountApi = _cfgCommon.SearchCountApi;
-            SettingDialog.FavoritesCountApi = _cfgCommon.FavoritesCountApi;
-            SettingDialog.UserTimelineCountApi = _cfgCommon.UserTimelineCountApi;
-            SettingDialog.ListCountApi = _cfgCommon.ListCountApi;
-
             SettingDialog.UserAppointUrl = _cfgCommon.UserAppointUrl;
 
             SettingDialog.EnableImgAzyobuziNet = _cfgCommon.EnableImgAzyobuziNet;
@@ -2527,7 +2518,7 @@ namespace OpenTween
                 case MyCommon.WORKERTYPE.UserTimeline:
                     bw.ReportProgress(50, MakeStatusMessage(args, false));
                     int count = 20;
-                    if (SettingDialog.UseAdditionalCount) count = SettingDialog.UserTimelineCountApi;
+                    if (this._cfgCommon.UseAdditionalCount) count = this._cfgCommon.UserTimelineCountApi;
                     if (string.IsNullOrEmpty(args.tName))
                     {
                         foreach (TabClass tb in _statuses.GetTabsByType(MyCommon.TabUsageType.UserTimeline))
@@ -7677,8 +7668,6 @@ namespace OpenTween
                 _cfgCommon.TokenSecret = tw.AccessTokenSecret;
                 _cfgCommon.UserAccounts = SettingDialog.UserAccounts;
 
-                _cfgCommon.CountApi = SettingDialog.CountApi;
-                _cfgCommon.CountApiReply = SettingDialog.CountApiReply;
                 _cfgCommon.TinyUrlResolve = SettingDialog.TinyUrlResolve;
                 _cfgCommon.UrlConvertAuto = SettingDialog.UrlConvertAuto;
                 _cfgCommon.DefaultTimeOut = SettingDialog.DefaultTimeOut;
@@ -7737,15 +7726,8 @@ namespace OpenTween
                 {
                     _cfgCommon.FocusLockToStatusText = this.ToolStripFocusLockMenuItem.Checked;
                 }
-                _cfgCommon.UseAdditionalCount = SettingDialog.UseAdditionalCount;
-                _cfgCommon.MoreCountApi = SettingDialog.MoreCountApi;
-                _cfgCommon.FirstCountApi = SettingDialog.FirstCountApi;
-                _cfgCommon.SearchCountApi = SettingDialog.SearchCountApi;
-                _cfgCommon.FavoritesCountApi = SettingDialog.FavoritesCountApi;
-                _cfgCommon.UserTimelineCountApi = SettingDialog.UserTimelineCountApi;
                 _cfgCommon.TrackWord = tw.TrackWord;
                 _cfgCommon.AllAtReply = tw.AllAtReply;
-                _cfgCommon.ListCountApi = SettingDialog.ListCountApi;
                 _cfgCommon.UseImageService = ImageSelector.ServiceIndex;
                 _cfgCommon.UseImageServiceName = ImageSelector.ServiceName;
                 _cfgCommon.UserAppointUrl = SettingDialog.UserAppointUrl;

diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 7f6fba2..1aaf4a7 100644 (file)
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -1377,17 +1377,17 @@ namespace OpenTween
 
             HttpStatusCode res;
             var content = "";
-            var count = AppendSettingDialog.Instance.CountApi;
-            if (gType == MyCommon.WORKERTYPE.Reply) count = AppendSettingDialog.Instance.CountApiReply;
-            if (AppendSettingDialog.Instance.UseAdditionalCount)
+            var count = SettingCommon.Instance.CountApi;
+            if (gType == MyCommon.WORKERTYPE.Reply) count = SettingCommon.Instance.CountApiReply;
+            if (SettingCommon.Instance.UseAdditionalCount)
             {
-                if (more && AppendSettingDialog.Instance.MoreCountApi != 0)
+                if (more && SettingCommon.Instance.MoreCountApi != 0)
                 {
-                    count = AppendSettingDialog.Instance.MoreCountApi;
+                    count = SettingCommon.Instance.MoreCountApi;
                 }
-                else if (startup && AppendSettingDialog.Instance.FirstCountApi != 0 && gType == MyCommon.WORKERTYPE.Timeline)
+                else if (startup && SettingCommon.Instance.FirstCountApi != 0 && gType == MyCommon.WORKERTYPE.Timeline)
                 {
-                    count = AppendSettingDialog.Instance.FirstCountApi;
+                    count = SettingCommon.Instance.FirstCountApi;
                 }
             }
             try
@@ -1797,28 +1797,28 @@ namespace OpenTween
             HttpStatusCode res;
             var content = "";
             int count;
-            if (AppendSettingDialog.Instance.UseAdditionalCount)
+            if (SettingCommon.Instance.UseAdditionalCount)
             {
-                count = AppendSettingDialog.Instance.ListCountApi;
+                count = SettingCommon.Instance.ListCountApi;
                 if (count == 0)
                 {
-                    if (more && AppendSettingDialog.Instance.MoreCountApi != 0)
+                    if (more && SettingCommon.Instance.MoreCountApi != 0)
                     {
-                        count = AppendSettingDialog.Instance.MoreCountApi;
+                        count = SettingCommon.Instance.MoreCountApi;
                     }
-                    else if (startup && AppendSettingDialog.Instance.FirstCountApi != 0)
+                    else if (startup && SettingCommon.Instance.FirstCountApi != 0)
                     {
-                        count = AppendSettingDialog.Instance.FirstCountApi;
+                        count = SettingCommon.Instance.FirstCountApi;
                     }
                     else
                     {
-                        count = AppendSettingDialog.Instance.CountApi;
+                        count = SettingCommon.Instance.CountApi;
                     }
                 }
             }
             else
             {
-                count = AppendSettingDialog.Instance.CountApi;
+                count = SettingCommon.Instance.CountApi;
             }
             try
             {
@@ -1963,14 +1963,14 @@ namespace OpenTween
             long? maxId = null;
             long? sinceId = null;
             var count = 100;
-            if (AppendSettingDialog.Instance.UseAdditionalCount &&
-                AppendSettingDialog.Instance.SearchCountApi != 0)
+            if (SettingCommon.Instance.UseAdditionalCount &&
+                SettingCommon.Instance.SearchCountApi != 0)
             {
-                count = AppendSettingDialog.Instance.SearchCountApi;
+                count = SettingCommon.Instance.SearchCountApi;
             }
             else
             {
-                count = AppendSettingDialog.Instance.CountApi;
+                count = SettingCommon.Instance.CountApi;
             }
             if (more)
             {
@@ -2189,11 +2189,11 @@ namespace OpenTween
 
             if (MyCommon._endingFlag) return "";
 
-            var count = AppendSettingDialog.Instance.CountApi;
-            if (AppendSettingDialog.Instance.UseAdditionalCount &&
-                AppendSettingDialog.Instance.FavoritesCountApi != 0)
+            var count = SettingCommon.Instance.CountApi;
+            if (SettingCommon.Instance.UseAdditionalCount &&
+                SettingCommon.Instance.FavoritesCountApi != 0)
             {
-                count = AppendSettingDialog.Instance.FavoritesCountApi;
+                count = SettingCommon.Instance.FavoritesCountApi;
             }
 
             // 前ページ取得の場合はページカウンタをインクリメント、それ以外の場合はページカウンタリセット