前データ取得と初回の取得数に0を入れたときは標準の取得数で取得するようにした

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@939 e39ad16e-3079-482e-bb30-4b4d378143b6

diff --git a/Tween/Setting.vb b/Tween/Setting.vb
index ce5b0a3..6023302 100644 (file)
--- a/Tween/Setting.vb
+++ b/Tween/Setting.vb
@@ -553,8 +553,8 @@ Public Class Setting
 
         GetMoreTextCountApi.Text = _MoreCountApi.ToString
         FirstTextCountApi.Text = _FirstCountApi.ToString
-        GetMoreTextCountApi.ReadOnly = Not UseChangeGetCount.Checked
-        FirstTextCountApi.ReadOnly = Not UseChangeGetCount.Checked
+        GetMoreTextCountApi.Enabled = UseChangeGetCount.Checked
+        FirstTextCountApi.Enabled = UseChangeGetCount.Checked
     End Sub
 
     Private Sub TimelinePeriod_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles TimelinePeriod.Validating
@@ -1995,7 +1995,7 @@ Public Class Setting
             Exit Sub
         End Try
 
-        If cnt < 20 OrElse cnt > 200 Then
+        If Not cnt = 0 AndAlso (cnt < 20 OrElse cnt > 200) Then
             MessageBox.Show(My.Resources.TextCountApi_Validating1)
             e.Cancel = True
             Exit Sub
@@ -2003,8 +2003,8 @@ Public Class Setting
     End Sub
 
     Private Sub UseChangeGetCount_CheckedChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles UseChangeGetCount.CheckedChanged
-        GetMoreTextCountApi.ReadOnly = Not UseChangeGetCount.Checked
-        FirstTextCountApi.ReadOnly = Not UseChangeGetCount.Checked
+        GetMoreTextCountApi.Enabled = UseChangeGetCount.Checked
+        FirstTextCountApi.Enabled = UseChangeGetCount.Checked
     End Sub
 
     Private Sub FirstTextCountApi_Validating(ByVal sender As Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles FirstTextCountApi.Validating
@@ -2017,7 +2017,7 @@ Public Class Setting
             Exit Sub
         End Try
 
-        If cnt < 20 OrElse cnt > 200 Then
+        If Not cnt = 0 AndAlso (cnt < 20 OrElse cnt > 200) Then
             MessageBox.Show(My.Resources.TextCountApi_Validating1)
             e.Cancel = True
             Exit Sub

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 26526ab..7fd2995 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -1852,10 +1852,10 @@ Public Class TweenMain
         Select Case args.type
             Case WORKERTYPE.Timeline, WORKERTYPE.Reply
                 bw.ReportProgress(50, MakeStatusMessage(args, False))
-                If _UseAdditionalFlags Then
+                If _UseAdditionalFlags AndAlso Not SettingDialog.MoreCountApi = 0 Then
                     _UseAdditionalFlags = False
                     ret = tw.GetTimelineApiAdditional(read, args.type, args.page = -1, SettingDialog.MoreCountApi)
-                ElseIf _FirstRefreshFlags AndAlso SettingDialog.UseChangeGetCount.Checked Then
+                ElseIf _FirstRefreshFlags AndAlso SettingDialog.UseChangeGetCount.Checked AndAlso Not SettingDialog.FirstCountApi = 0 Then
                     _FirstRefreshFlags = False
                     ret = tw.GetTimelineApiAdditional(read, args.type, args.page = -1, SettingDialog.FirstCountApi)
                 Else
@@ -2022,7 +2022,7 @@ Public Class TweenMain
                 bw.ReportProgress(50, MakeStatusMessage(args, False))
                 If args.tName = "" Then
                     For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.Lists)
-                        If _FirstListsRefreshFlags AndAlso SettingDialog.UseChangeGetCount.Checked Then
+                        If _FirstListsRefreshFlags AndAlso SettingDialog.UseChangeGetCount.Checked AndAlso Not SettingDialog.FirstCountApi = 0 Then
                             _FirstListsRefreshFlags = False
                             If tb.ListInfo IsNot Nothing AndAlso tb.ListInfo.Id <> 0 Then ret = tw.GetListStatusAdditional(read, tb, False, SettingDialog.FirstCountApi)
                         Else
@@ -2032,7 +2032,7 @@ Public Class TweenMain
                 Else
                     Dim tb As TabClass = _statuses.GetTabByName(args.tName)
                     If tb IsNot Nothing Then
-                        If _UseAdditionalFlags Then
+                        If _UseAdditionalFlags AndAlso Not SettingDialog.MoreCountApi = 0 Then
                             _UseAdditionalFlags = False
                             ret = tw.GetListStatusAdditional(read, tb, args.page = -1, SettingDialog.MoreCountApi)
                         Else