やり直し

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

diff --git a/Tween.sln b/Tween.sln
index a6ad2ec..d55fdaa 100644 (file)
--- a/Tween.sln
+++ b/Tween.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Basic Express 2010
+# Visual Studio 2010
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Tween", "Tween\Tween.vbproj", "{41B54F21-5442-47D4-80F0-872D56D9E1FD}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TweenUp", "TweenUp\TweenUp.vbproj", "{EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}"
@@ -13,8 +13,8 @@ Global
                Release|x86 = Release|x86
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {41B54F21-5442-47D4-80F0-872D56D9E1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {41B54F21-5442-47D4-80F0-872D56D9E1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {41B54F21-5442-47D4-80F0-872D56D9E1FD}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {41B54F21-5442-47D4-80F0-872D56D9E1FD}.Debug|Any CPU.Build.0 = Debug|x86
                {41B54F21-5442-47D4-80F0-872D56D9E1FD}.Debug|x86.ActiveCfg = Debug|x86
                {41B54F21-5442-47D4-80F0-872D56D9E1FD}.Debug|x86.Build.0 = Debug|x86
                {41B54F21-5442-47D4-80F0-872D56D9E1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Tween/EventViewerDialog.Designer.vb b/Tween/EventViewerDialog.Designer.vb
index 5d37e96..f5a13ca 100644 (file)
--- a/Tween/EventViewerDialog.Designer.vb
+++ b/Tween/EventViewerDialog.Designer.vb
@@ -44,8 +44,11 @@ Partial Class EventViewerDialog
         Me.TextBoxKeyword = New System.Windows.Forms.TextBox()
         Me.CheckRegex = New System.Windows.Forms.CheckBox()
         Me.CheckBoxFilter = New System.Windows.Forms.CheckBox()
+        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.StatusLabelCount = New System.Windows.Forms.ToolStripStatusLabel()
         Me.TabEventType.SuspendLayout()
         Me.TabPageAll.SuspendLayout()
+        Me.StatusStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
         'OK_Button
@@ -189,6 +192,17 @@ Partial Class EventViewerDialog
         Me.CheckBoxFilter.Name = "CheckBoxFilter"
         Me.CheckBoxFilter.UseVisualStyleBackColor = True
         '
+        'StatusStrip1
+        '
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StatusLabelCount})
+        resources.ApplyResources(Me.StatusStrip1, "StatusStrip1")
+        Me.StatusStrip1.Name = "StatusStrip1"
+        '
+        'StatusLabelCount
+        '
+        Me.StatusLabelCount.Name = "StatusLabelCount"
+        resources.ApplyResources(Me.StatusLabelCount, "StatusLabelCount")
+        '
         'EventViewerDialog
         '
         resources.ApplyResources(Me, "$this")
@@ -201,11 +215,14 @@ Partial Class EventViewerDialog
         Me.Controls.Add(Me.ButtonRefresh)
         Me.Controls.Add(Me.CheckExcludeMyEvent)
         Me.Controls.Add(Me.OK_Button)
+        Me.Controls.Add(Me.StatusStrip1)
         Me.DoubleBuffered = True
         Me.Name = "EventViewerDialog"
         Me.ShowInTaskbar = False
         Me.TabEventType.ResumeLayout(False)
         Me.TabPageAll.ResumeLayout(False)
+        Me.StatusStrip1.ResumeLayout(False)
+        Me.StatusStrip1.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -231,5 +248,7 @@ Partial Class EventViewerDialog
     Friend WithEvents TextBoxKeyword As System.Windows.Forms.TextBox
     Friend WithEvents CheckRegex As System.Windows.Forms.CheckBox
     Friend WithEvents CheckBoxFilter As System.Windows.Forms.CheckBox
+    Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
+    Friend WithEvents StatusLabelCount As System.Windows.Forms.ToolStripStatusLabel
 
 End Class

diff --git a/Tween/EventViewerDialog.resx b/Tween/EventViewerDialog.resx
index ebbe9f9..cc5bf6b 100644 (file)
--- a/Tween/EventViewerDialog.resx
+++ b/Tween/EventViewerDialog.resx
@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
-    <value>659, 301</value>
+    <value>659, 298</value>
   </data>
   <data name="OK_Button.Size" type="System.Drawing.Size, System.Drawing">
     <value>67, 21</value>
@@ -154,7 +154,7 @@
     <value>True</value>
   </data>
   <data name="CheckExcludeMyEvent.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 249</value>
+    <value>12, 246</value>
   </data>
   <data name="CheckExcludeMyEvent.Size" type="System.Drawing.Size, System.Drawing">
     <value>197, 16</value>
@@ -181,7 +181,7 @@
     <value>Bottom, Right</value>
   </data>
   <data name="ButtonRefresh.Location" type="System.Drawing.Point, System.Drawing">
-    <value>600, 261</value>
+    <value>600, 258</value>
   </data>
   <data name="ButtonRefresh.Size" type="System.Drawing.Size, System.Drawing">
     <value>126, 21</value>
@@ -241,7 +241,7 @@
     <value>3, 3</value>
   </data>
   <data name="EventList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>700, 189</value>
+    <value>700, 186</value>
   </data>
   <data name="EventList.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -265,7 +265,7 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="TabPageAll.Size" type="System.Drawing.Size, System.Drawing">
-    <value>706, 195</value>
+    <value>706, 192</value>
   </data>
   <data name="TabPageAll.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -505,7 +505,7 @@
     <value>12, 12</value>
   </data>
   <data name="TabEventType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>714, 221</value>
+    <value>714, 218</value>
   </data>
   <data name="TabEventType.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -526,7 +526,7 @@
     <value>Bottom, Left</value>
   </data>
   <data name="TextBoxKeyword.Location" type="System.Drawing.Point, System.Drawing">
-    <value>142, 278</value>
+    <value>142, 275</value>
   </data>
   <data name="TextBoxKeyword.Size" type="System.Drawing.Size, System.Drawing">
     <value>231, 19</value>
@@ -553,7 +553,7 @@
     <value>True</value>
   </data>
   <data name="CheckRegex.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 304</value>
+    <value>12, 301</value>
   </data>
   <data name="CheckRegex.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 16</value>
@@ -583,7 +583,7 @@
     <value>True</value>
   </data>
   <data name="CheckBoxFilter.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 280</value>
+    <value>12, 277</value>
   </data>
   <data name="CheckBoxFilter.Size" type="System.Drawing.Size, System.Drawing">
     <value>124, 16</value>
@@ -606,14 +606,50 @@
   <data name="&gt;&gt;CheckBoxFilter.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>24, 10</value>
+  </metadata>
+  <data name="StatusLabelCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>111, 18</value>
+  </data>
+  <data name="StatusLabelCount.Text" xml:space="preserve">
+    <value>StatusLabelCount</value>
+  </data>
+  <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 339</value>
+  </data>
+  <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>738, 23</value>
+  </data>
+  <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="StatusStrip1.Text" xml:space="preserve">
+    <value>StatusStrip1</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip1.Name" xml:space="preserve">
+    <value>StatusStrip1</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>39</value>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 12</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>738, 334</value>
+    <value>738, 362</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>
@@ -645,6 +681,12 @@
   <data name="&gt;&gt;ColumnHeader4.Type" xml:space="preserve">
     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;StatusLabelCount.Name" xml:space="preserve">
+    <value>StatusLabelCount</value>
+  </data>
+  <data name="&gt;&gt;StatusLabelCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>EventViewerDialog</value>
   </data>

diff --git a/Tween/EventViewerDialog.vb b/Tween/EventViewerDialog.vb
index 1d15a5b..49e8cb3 100644 (file)
--- a/Tween/EventViewerDialog.vb
+++ b/Tween/EventViewerDialog.vb
@@ -55,14 +55,10 @@ Public Class EventViewerDialog
     End Function
 
     Private Sub EventViewerDialog_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
-        If EventSource IsNot Nothing AndAlso EventSource.Count > 0 Then
-            EventList.BeginUpdate()
-            _curTab = TabPageAll
-            CreateFilterdEventSource()
-            Me.EventList.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent)
-            EventList.EndUpdate()
-        End If
+        EventList.BeginUpdate()
         _curTab = TabEventType.SelectedTab
+        CreateFilterdEventSource()
+        EventList.EndUpdate()
     End Sub
 
     Private Sub EventList_DoubleClick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles EventList.DoubleClick
@@ -104,6 +100,9 @@ Public Class EventViewerDialog
                                     Select x).ToArray()
             _ItemCache = Nothing
             EventList.VirtualListSize = _filterdEventSource.Count
+            StatusLabelCount.Text = String.Format("{0} / {1}", _filterdEventSource.Count, EventSource.Count)
+        Else
+            StatusLabelCount.Text = "0 / 0"
         End If
     End Sub
 

diff --git a/Tween/Resources/ChangeLog.txt b/Tween/Resources/ChangeLog.txt
index 7000e8b..dc9ba31 100644 (file)
--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -68,11 +68,6 @@
  * 詳細表示の更新頻度見直し
  * プロフィール表示時に最新発言が返ってこないユーザーの表示ができなかったバグを修正
  * その他メニューに指定ユーザーのユーザータイムライン、ふぁぼられを開く機能を追加
- * 画像投稿先を保持するようにした
- * UserStreamが有効の場合はRecent/Mentions/DMの定期更新、投稿時取得を停止するようにした
- * プロフィール画面でアカウント作成日時が正しく表示されない場合があるのを修正した
- * API簡易計算でUserStream、UserTimelineを考慮するように
- * API情報ダイアログにUserStream接続状態も表示するように
 ==== Ver 0.9.7.0(2010/11/14)
  * 描画周りの高速化と調整を行った
  * リスト表示が真っ白になる現象の対策を行った　まだ発生する方はご連絡ください。