svnno****@sourc*****
svnno****@sourc*****
2011年 1月 26日 (水) 00:05:46 JST
Revision: 1407
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1407
Author: syo68k
Date: 2011-01-26 00:05:46 +0900 (Wed, 26 Jan 2011)
Log Message:
-----------
API簡易計算においてUserStreamを考慮するように
Modified Paths:
--------------
trunk/Tween/AppendSettingDialog.Designer.vb
trunk/Tween/AppendSettingDialog.resx
trunk/Tween/AppendSettingDialog.vb
trunk/Tween/My Project/Resources.Designer.vb
trunk/Tween/My Project/Resources.resx
-------------- next part --------------
Modified: trunk/Tween/AppendSettingDialog.Designer.vb
===================================================================
--- trunk/Tween/AppendSettingDialog.Designer.vb 2011-01-25 11:27:37 UTC (rev 1406)
+++ trunk/Tween/AppendSettingDialog.Designer.vb 2011-01-25 15:05:46 UTC (rev 1407)
@@ -26,6 +26,8 @@
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.TreeViewSetting = New System.Windows.Forms.TreeView()
Me.GetPeriodPanel = New System.Windows.Forms.Panel()
+ Me.LabelApiUsingUserStreamEnabled = New System.Windows.Forms.Label()
+ Me.LabelUserStreamActive = New System.Windows.Forms.Label()
Me.Label21 = New System.Windows.Forms.Label()
Me.UserTimelinePeriod = New System.Windows.Forms.TextBox()
Me.TimelinePeriod = New System.Windows.Forms.TextBox()
@@ -328,6 +330,8 @@
'
'GetPeriodPanel
'
+ Me.GetPeriodPanel.Controls.Add(Me.LabelApiUsingUserStreamEnabled)
+ Me.GetPeriodPanel.Controls.Add(Me.LabelUserStreamActive)
Me.GetPeriodPanel.Controls.Add(Me.Label21)
Me.GetPeriodPanel.Controls.Add(Me.UserTimelinePeriod)
Me.GetPeriodPanel.Controls.Add(Me.TimelinePeriod)
@@ -348,6 +352,16 @@
resources.ApplyResources(Me.GetPeriodPanel, "GetPeriodPanel")
Me.GetPeriodPanel.Name = "GetPeriodPanel"
'
+ 'LabelApiUsingUserStreamEnabled
+ '
+ resources.ApplyResources(Me.LabelApiUsingUserStreamEnabled, "LabelApiUsingUserStreamEnabled")
+ Me.LabelApiUsingUserStreamEnabled.Name = "LabelApiUsingUserStreamEnabled"
+ '
+ 'LabelUserStreamActive
+ '
+ resources.ApplyResources(Me.LabelUserStreamActive, "LabelUserStreamActive")
+ Me.LabelUserStreamActive.Name = "LabelUserStreamActive"
+ '
'Label21
'
resources.ApplyResources(Me.Label21, "Label21")
@@ -2189,4 +2203,6 @@
Friend WithEvents Label29 As System.Windows.Forms.Label
Friend WithEvents ComboBoxEventNotifySound As System.Windows.Forms.ComboBox
Friend WithEvents Label35 As System.Windows.Forms.Label
+ Friend WithEvents LabelUserStreamActive As System.Windows.Forms.Label
+ Friend WithEvents LabelApiUsingUserStreamEnabled As System.Windows.Forms.Label
End Class
Modified: trunk/Tween/AppendSettingDialog.resx
===================================================================
--- trunk/Tween/AppendSettingDialog.resx 2011-01-25 11:27:37 UTC (rev 1406)
+++ trunk/Tween/AppendSettingDialog.resx 2011-01-25 15:05:46 UTC (rev 1407)
@@ -260,6 +260,62 @@
<data name=">>SplitContainer1.Panel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="LabelApiUsingUserStreamEnabled.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="LabelApiUsingUserStreamEnabled.Location" type="System.Drawing.Point, System.Drawing">
+ <value>22, 292</value>
+ </data>
+ <data name="LabelApiUsingUserStreamEnabled.Size" type="System.Drawing.Size, System.Drawing">
+ <value>23, 12</value>
+ </data>
+ <data name="LabelApiUsingUserStreamEnabled.TabIndex" type="System.Int32, mscorlib">
+ <value>18</value>
+ </data>
+ <data name="LabelApiUsingUserStreamEnabled.Text" xml:space="preserve">
+ <value>999</value>
+ </data>
+ <data name=">>LabelApiUsingUserStreamEnabled.Name" xml:space="preserve">
+ <value>LabelApiUsingUserStreamEnabled</value>
+ </data>
+ <data name=">>LabelApiUsingUserStreamEnabled.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>LabelApiUsingUserStreamEnabled.Parent" xml:space="preserve">
+ <value>GetPeriodPanel</value>
+ </data>
+ <data name=">>LabelApiUsingUserStreamEnabled.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="LabelUserStreamActive.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="LabelUserStreamActive.Location" type="System.Drawing.Point, System.Drawing">
+ <value>22, 245</value>
+ </data>
+ <data name="LabelUserStreamActive.Size" type="System.Drawing.Size, System.Drawing">
+ <value>348, 36</value>
+ </data>
+ <data name="LabelUserStreamActive.TabIndex" type="System.Int32, mscorlib">
+ <value>17</value>
+ </data>
+ <data name="LabelUserStreamActive.Text" xml:space="preserve">
+ <value>UserStreamが有効です。
+タイムライン/Mentions/DMの定期更新、投稿時取得は停止しています。
+これらはUserStreamによりリアルタイム更新されます。</value>
+ </data>
+ <data name=">>LabelUserStreamActive.Name" xml:space="preserve">
+ <value>LabelUserStreamActive</value>
+ </data>
+ <data name=">>LabelUserStreamActive.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>LabelUserStreamActive.Parent" xml:space="preserve">
+ <value>GetPeriodPanel</value>
+ </data>
+ <data name=">>LabelUserStreamActive.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="Label21.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -285,7 +341,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>Label21.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>2</value>
</data>
<data name="UserTimelinePeriod.Location" type="System.Drawing.Point, System.Drawing">
<value>258, 163</value>
@@ -306,7 +362,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>UserTimelinePeriod.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>3</value>
</data>
<data name="TimelinePeriod.Location" type="System.Drawing.Point, System.Drawing">
<value>258, 21</value>
@@ -327,7 +383,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>TimelinePeriod.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>4</value>
</data>
<data name="Label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -357,13 +413,13 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>Label3.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>5</value>
</data>
<data name="ButtonApiCalc.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="ButtonApiCalc.Location" type="System.Drawing.Point, System.Drawing">
- <value>120, 241</value>
+ <value>205, 323</value>
</data>
<data name="ButtonApiCalc.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 23</value>
@@ -384,7 +440,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>ButtonApiCalc.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>6</value>
</data>
<data name="LabelPostAndGet.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -393,7 +449,7 @@
<value>NoControl</value>
</data>
<data name="LabelPostAndGet.Location" type="System.Drawing.Point, System.Drawing">
- <value>27, 220</value>
+ <value>22, 220</value>
</data>
<data name="LabelPostAndGet.Size" type="System.Drawing.Size, System.Drawing">
<value>285, 12</value>
@@ -414,7 +470,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>LabelPostAndGet.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>7</value>
</data>
<data name="LabelApiUsing.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -447,7 +503,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>LabelApiUsing.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>8</value>
</data>
<data name="Label33.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -456,7 +512,7 @@
<value>NoControl</value>
</data>
<data name="Label33.Location" type="System.Drawing.Point, System.Drawing">
- <value>22, 138</value>
+ <value>22, 142</value>
</data>
<data name="Label33.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 12</value>
@@ -477,7 +533,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>Label33.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>9</value>
</data>
<data name="ListsPeriod.Location" type="System.Drawing.Point, System.Drawing">
<value>258, 135</value>
@@ -498,7 +554,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>ListsPeriod.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>10</value>
</data>
<data name="Label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -507,7 +563,7 @@
<value>NoControl</value>
</data>
<data name="Label7.Location" type="System.Drawing.Point, System.Drawing">
- <value>22, 114</value>
+ <value>22, 117</value>
</data>
<data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 12</value>
@@ -528,7 +584,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>Label7.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>11</value>
</data>
<data name="PubSearchPeriod.Location" type="System.Drawing.Point, System.Drawing">
<value>258, 111</value>
@@ -549,7 +605,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>PubSearchPeriod.ZOrder" xml:space="preserve">
- <value>10</value>
+ <value>12</value>
</data>
<data name="Label69.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -558,7 +614,7 @@
<value>NoControl</value>
</data>
<data name="Label69.Location" type="System.Drawing.Point, System.Drawing">
- <value>22, 66</value>
+ <value>22, 67</value>
</data>
<data name="Label69.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 12</value>
@@ -579,7 +635,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>Label69.ZOrder" xml:space="preserve">
- <value>11</value>
+ <value>13</value>
</data>
<data name="ReplyPeriod.Location" type="System.Drawing.Point, System.Drawing">
<value>258, 63</value>
@@ -600,7 +656,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>ReplyPeriod.ZOrder" xml:space="preserve">
- <value>12</value>
+ <value>14</value>
</data>
<data name="CheckPostAndGet.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -630,7 +686,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>CheckPostAndGet.ZOrder" xml:space="preserve">
- <value>13</value>
+ <value>15</value>
</data>
<data name="CheckPeriodAdjust.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -663,7 +719,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>CheckPeriodAdjust.ZOrder" xml:space="preserve">
- <value>14</value>
+ <value>16</value>
</data>
<data name="Label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -672,7 +728,7 @@
<value>NoControl</value>
</data>
<data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
- <value>22, 90</value>
+ <value>22, 92</value>
</data>
<data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 12</value>
@@ -693,7 +749,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>Label5.ZOrder" xml:space="preserve">
- <value>15</value>
+ <value>17</value>
</data>
<data name="DMPeriod.Location" type="System.Drawing.Point, System.Drawing">
<value>258, 87</value>
@@ -714,7 +770,7 @@
<value>GetPeriodPanel</value>
</data>
<data name=">>DMPeriod.ZOrder" xml:space="preserve">
- <value>16</value>
+ <value>18</value>
</data>
<data name="GetPeriodPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
Modified: trunk/Tween/AppendSettingDialog.vb
===================================================================
--- trunk/Tween/AppendSettingDialog.vb 2011-01-25 11:27:37 UTC (rev 1406)
+++ trunk/Tween/AppendSettingDialog.vb 2011-01-25 15:05:46 UTC (rev 1407)
@@ -2168,6 +2168,9 @@
Dim tmp As Integer
Dim ListsTabNum As Integer = 0
Dim UserTimelineTabNum As Integer = 0
+ Dim ApiLists As Integer = 0
+ Dim ApiUserTimeline As Integer = 0
+ Dim UsingApiUserStream As Integer = 0
Try
' 初回起動時などにNothingの場合あり
@@ -2207,14 +2210,16 @@
' Listsタブ計算 0は手動更新
If Integer.TryParse(ListsPeriod.Text, tmp) Then
If tmp <> 0 Then
- UsingApi += (3600 \ tmp) * ListsTabNum
+ ApiLists = (3600 \ tmp) * ListsTabNum
+ UsingApi += ApiLists
End If
End If
- ' Listsタブ計算 0は手動更新
+ ' UserTimelineタブ計算 0は手動更新
If Integer.TryParse(UserTimelinePeriod.Text, tmp) Then
If tmp <> 0 Then
- UsingApi += (3600 \ tmp) * UserTimelineTabNum
+ ApiUserTimeline = (3600 \ tmp) * UserTimelineTabNum
+ UsingApi += ApiUserTimeline
End If
End If
@@ -2236,8 +2241,11 @@
End If
- LabelPostAndGet.Visible = CheckPostAndGet.Checked
+ LabelPostAndGet.Visible = CheckPostAndGet.Checked AndAlso Not tw.UserStreamEnabled
+ LabelUserStreamActive.Visible = tw.UserStreamEnabled
+ LabelApiUsingUserStreamEnabled.Text = String.Format(My.Resources.SettingAPIUse2, (ApiLists + ApiUserTimeline).ToString)
+ LabelApiUsingUserStreamEnabled.Visible = tw.UserStreamEnabled
End Sub
Private Sub CheckPostAndGet_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CheckPostAndGet.CheckedChanged
Modified: trunk/Tween/My Project/Resources.Designer.vb
===================================================================
--- trunk/Tween/My Project/Resources.Designer.vb 2011-01-25 11:27:37 UTC (rev 1406)
+++ trunk/Tween/My Project/Resources.Designer.vb 2011-01-25 15:05:46 UTC (rev 1407)
@@ -2165,6 +2165,15 @@
End Property
'''<summary>
+ ''' UserStream有効時の消費API数 : {0} / h に類似しているローカライズされた文字列を検索します。
+ '''</summary>
+ Friend ReadOnly Property SettingAPIUse2() As String
+ Get
+ Return ResourceManager.GetString("SettingAPIUse2", resourceCulture)
+ End Get
+ End Property
+
+ '''<summary>
''' IDとAPIキーの組み合わせが違います。IDと同時に設定するのはパスワードではなくAPIキーです。ご確認ください。 に類似しているローカライズされた文字列を検索します。
'''</summary>
Friend ReadOnly Property SettingSave_ClickText1() As String
Modified: trunk/Tween/My Project/Resources.resx
===================================================================
--- trunk/Tween/My Project/Resources.resx 2011-01-25 11:27:37 UTC (rev 1406)
+++ trunk/Tween/My Project/Resources.resx 2011-01-25 15:05:46 UTC (rev 1407)
@@ -1054,4 +1054,7 @@
<data name="TranslateDefaultLanguage" xml:space="preserve">
<value>ja</value>
</data>
+ <data name="SettingAPIUse2" xml:space="preserve">
+ <value>UserStream有効時の消費API数 : {0} / h</value>
+ </data>
</root>
\ No newline at end of file