OSDN Git Service

(root) / opentween / open-tween.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25523f1)
・Favorites取得数を設定できるようにした。０で標準取得数に合わせる
authorf_swallow <f_swallow@users.sourceforge.jp>
Wed, 20 Oct 2010 11:34:30 +0000 (11:34 +0000)
committerKimura Youichi <kim.upsilon@bucyou.net>
Sat, 18 Feb 2012 14:16:02 +0000 (23:16 +0900)
・Search取得数に１０１以上が取得できたのを修正し０を有効にした

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

Tween/Setting.Designer.vb patch | blob | history
Tween/Setting.resx patch | blob | history
Tween/Setting.vb patch | blob | history
Tween/Setting/SettingCommon.vb patch | blob | history
Tween/Tween.vb patch | blob | history
Tween/Twitter.vb patch | blob | history

diff --git a/Tween/Setting.Designer.vb b/Tween/Setting.Designer.vb
index 54a80c8..c1719be 100644 (file)
--- a/Tween/Setting.Designer.vb
+++ b/Tween/Setting.Designer.vb
@@ -249,6 +249,7 @@ Partial Class Setting
         Me.Label59 = New System.Windows.Forms.Label()
         Me.TextBoxOutputzKey = New System.Windows.Forms.TextBox()
         Me.CheckOutputz = New System.Windows.Forms.CheckBox()
+        Me.FavoritesTextCountApi = New System.Windows.Forms.TextBox()
         Me.GroupBox1.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -1659,6 +1660,7 @@ Partial Class Setting
         '
         'TabPage6
         '
+        Me.TabPage6.Controls.Add(Me.FavoritesTextCountApi)
         Me.TabPage6.Controls.Add(Me.SearchTextCountApi)
         Me.TabPage6.Controls.Add(Me.Label66)
         Me.TabPage6.Controls.Add(Me.FirstTextCountApi)
@@ -1741,6 +1743,11 @@ Partial Class Setting
         Me.CheckOutputz.Name = "CheckOutputz"
         Me.CheckOutputz.UseVisualStyleBackColor = True
         '
+        'FavoritesTextCountApi
+        '
+        resources.ApplyResources(Me.FavoritesTextCountApi, "FavoritesTextCountApi")
+        Me.FavoritesTextCountApi.Name = "FavoritesTextCountApi"
+        '
         'Setting
         '
         Me.AcceptButton = Me.Save
@@ -2002,4 +2009,5 @@ Partial Class Setting
     Friend WithEvents CheckEnableBasicAuth As System.Windows.Forms.CheckBox
     Friend WithEvents SearchTextCountApi As System.Windows.Forms.TextBox
     Friend WithEvents Label66 As System.Windows.Forms.Label
+    Friend WithEvents FavoritesTextCountApi As System.Windows.Forms.TextBox
 End Class
diff --git a/Tween/Setting.resx b/Tween/Setting.resx
index 72672bb..b40c9d4 100644 (file)
--- a/Tween/Setting.resx
+++ b/Tween/Setting.resx
@@ -5916,6 +5916,27 @@
   <data name="&gt;&gt;TabPage5.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
+  <data name="FavoritesTextCountApi.Location" type="System.Drawing.Point, System.Drawing">
+    <value>267, 233</value>
+  </data>
+  <data name="FavoritesTextCountApi.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 19</value>
+  </data>
+  <data name="FavoritesTextCountApi.TabIndex" type="System.Int32, mscorlib">
+    <value>13</value>
+  </data>
+  <data name="&gt;&gt;FavoritesTextCountApi.Name" xml:space="preserve">
+    <value>FavoritesTextCountApi</value>
+  </data>
+  <data name="&gt;&gt;FavoritesTextCountApi.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;FavoritesTextCountApi.Parent" xml:space="preserve">
+    <value>TabPage6</value>
+  </data>
+  <data name="&gt;&gt;FavoritesTextCountApi.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="SearchTextCountApi.Location" type="System.Drawing.Point, System.Drawing">
     <value>324, 234</value>
   </data>
@@ -5935,7 +5956,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;SearchTextCountApi.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="Label66.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -5944,13 +5965,13 @@
     <value>13, 234</value>
   </data>
   <data name="Label66.Size" type="System.Drawing.Size, System.Drawing">
-    <value>117, 12</value>
+    <value>171, 12</value>
   </data>
   <data name="Label66.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
   </data>
   <data name="Label66.Text" xml:space="preserve">
-    <value>PublicSearchの取得数</value>
+    <value>Favorites/PublicSearchの取得数</value>
   </data>
   <data name="&gt;&gt;Label66.Name" xml:space="preserve">
     <value>Label66</value>
@@ -5962,7 +5983,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;Label66.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="FirstTextCountApi.Location" type="System.Drawing.Point, System.Drawing">
     <value>324, 209</value>
@@ -5983,7 +6004,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;FirstTextCountApi.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="GetMoreTextCountApi.Location" type="System.Drawing.Point, System.Drawing">
     <value>266, 209</value>
@@ -6004,7 +6025,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;GetMoreTextCountApi.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="Label53.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6031,7 +6052,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;Label53.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="UseChangeGetCount.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6058,7 +6079,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;UseChangeGetCount.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="CheckNicoms.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6088,7 +6109,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;CheckNicoms.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="Label60.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6115,7 +6136,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;Label60.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="ComboBoxOutputzUrlmode.Items" xml:space="preserve">
     <value>twitter.com</value>
@@ -6142,7 +6163,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;ComboBoxOutputzUrlmode.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="Label59.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6169,7 +6190,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;Label59.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="TextBoxOutputzKey.Location" type="System.Drawing.Point, System.Drawing">
     <value>197, 62</value>
@@ -6190,7 +6211,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;TextBoxOutputzKey.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="CheckOutputz.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6217,7 +6238,7 @@
     <value>TabPage6</value>
   </data>
   <data name="&gt;&gt;CheckOutputz.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="TabPage6.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
diff --git a/Tween/Setting.vb b/Tween/Setting.vb
index 41a6908..4901b54 100644 (file)
--- a/Tween/Setting.vb
+++ b/Tween/Setting.vb
@@ -122,6 +122,7 @@ Public Class Setting
     Private _FirstCountApi As Integer
     Private _MyUseAdditonalCount As Boolean
     Private _SearchCountApi As Integer
+    Private _FavoritesCountApi As Integer
 
     Private _ValidationError As Boolean = False
 
@@ -310,6 +311,7 @@ Public Class Setting
             _MoreCountApi = CType(GetMoreTextCountApi.Text, Integer)
             _FirstCountApi = CType(FirstTextCountApi.Text, Integer)
             _SearchCountApi = CType(SearchTextCountApi.Text, Integer)
+            _FavoritesCountApi = CType(FavoritesTextCountApi.Text, Integer)
         Catch ex As Exception
             MessageBox.Show(My.Resources.Save_ClickText3)
             Me.DialogResult = Windows.Forms.DialogResult.Cancel
@@ -555,15 +557,17 @@ Public Class Setting
 
         CheckOutputz_CheckedChanged(sender, e)
 
-        UseChangeGetCount.Checked = _MyUseAdditonalCount
-        Label53.Enabled = UseChangeGetCount.Checked
-        Label66.Enabled = UseChangeGetCount.Checked
         GetMoreTextCountApi.Text = _MoreCountApi.ToString
         FirstTextCountApi.Text = _FirstCountApi.ToString
         SearchTextCountApi.Text = _SearchCountApi.ToString
+        FavoritesTextCountApi.Text = _FavoritesCountApi.ToString
+        UseChangeGetCount.Checked = _MyUseAdditonalCount
+        Label53.Enabled = UseChangeGetCount.Checked
+        Label66.Enabled = UseChangeGetCount.Checked
         GetMoreTextCountApi.Enabled = UseChangeGetCount.Checked
         FirstTextCountApi.Enabled = UseChangeGetCount.Checked
         SearchTextCountApi.Enabled = UseChangeGetCount.Checked
+        FavoritesTextCountApi.Enabled = UseChangeGetCount.Checked
     End Sub
 
     Private Sub TimelinePeriod_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles TimelinePeriod.Validating
@@ -1144,6 +1148,15 @@ Public Class Setting
         End Set
     End Property
 
+    Public Property FavoritesCountApi() As Integer
+        Get
+            Return _FavoritesCountApi
+        End Get
+        Set(ByVal value As Integer)
+            _FavoritesCountApi = value
+        End Set
+    End Property
+
     Public Property PostAndGet() As Boolean
         Get
             Return _MyPostAndGet
@@ -2034,6 +2047,7 @@ Public Class Setting
         Label53.Enabled = UseChangeGetCount.Checked
         Label66.Enabled = UseChangeGetCount.Checked
         SearchTextCountApi.Enabled = UseChangeGetCount.Checked
+        FavoritesTextCountApi.Enabled = UseChangeGetCount.Checked
     End Sub
 
     Private Sub FirstTextCountApi_Validating(ByVal sender As Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles FirstTextCountApi.Validating
@@ -2060,14 +2074,31 @@ Public Class Setting
     Private Sub SearchTextCountApi_Validating(ByVal sender As Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles SearchTextCountApi.Validating
         Dim cnt As Integer
         Try
-            cnt = Integer.Parse(FirstTextCountApi.Text)
+            cnt = Integer.Parse(SearchTextCountApi.Text)
         Catch ex As Exception
             MessageBox.Show(My.Resources.TextCountApi_Validating1)
             e.Cancel = True
             Exit Sub
         End Try
 
-        If cnt < 20 OrElse cnt > 200 Then
+        If Not cnt = 0 AndAlso (cnt < 20 OrElse cnt > 100) Then
+            MessageBox.Show(My.Resources.TextCountApi_Validating1)
+            e.Cancel = True
+            Exit Sub
+        End If
+    End Sub
+
+    Private Sub FavoritesTextCountApi_Validating(ByVal sender As Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles FavoritesTextCountApi.Validating
+        Dim cnt As Integer
+        Try
+            cnt = Integer.Parse(FavoritesTextCountApi.Text)
+        Catch ex As Exception
+            MessageBox.Show(My.Resources.TextCountApi_Validating1)
+            e.Cancel = True
+            Exit Sub
+        End Try
+
+        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/Setting/SettingCommon.vb b/Tween/Setting/SettingCommon.vb
index b491f83..9dd3dec 100644 (file)
--- a/Tween/Setting/SettingCommon.vb
+++ b/Tween/Setting/SettingCommon.vb
@@ -169,4 +169,5 @@ Public Class SettingCommon
     Public MoreCountApi As Integer = 200
     Public FirstCountApi As Integer = 100
     Public SearchCountApi As Integer = 100
+    Public FavoritesCountApi As Integer = 40
 End Class
diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 31213aa..221bd7f 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -753,6 +753,7 @@ Public Class TweenMain
         SettingDialog.MoreCountApi = _cfgCommon.MoreCountApi
         SettingDialog.FirstCountApi = _cfgCommon.FirstCountApi
         SettingDialog.SearchCountApi = _cfgCommon.SearchCountApi
+        SettingDialog.FavoritesCountApi = _cfgCommon.FavoritesCountApi
         'If _cfgCommon.UseAdditionalCount Then
         '    _FirstRefreshFlags = True
         '    _FirstListsRefreshFlags = True
@@ -5623,6 +5624,7 @@ RETRY:
             _cfgCommon.MoreCountApi = SettingDialog.MoreCountApi
             _cfgCommon.FirstCountApi = SettingDialog.FirstCountApi
             _cfgCommon.SearchCountApi = SettingDialog.SearchCountApi
+            _cfgCommon.FavoritesCountApi = SettingDialog.FavoritesCountApi
 
             _cfgCommon.Save()
         End SyncLock
diff --git a/Tween/Twitter.vb b/Tween/Twitter.vb
index 69d0175..0699154 100644 (file)
--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -1877,6 +1877,10 @@ Public Class Twitter
         Dim res As HttpStatusCode
         Dim content As String = ""
         Dim count As Integer = Setting.Instance.CountApi
+        If Setting.Instance.UseAdditionalCount AndAlso
+            Setting.Instance.FavoritesCountApi <> 0 Then
+            count = Setting.Instance.FavoritesCountApi
+        End If
         Try
             res = twCon.Favorites(count, content)
         Catch ex As Exception
開発に使用するリポジトリ
About OSDN
Find Software
Develop Software
Help