svnno****@sourc*****
svnno****@sourc*****
2010年 11月 23日 (火) 21:15:51 JST
Revision: 1098
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1098
Author: neta
Date: 2010-11-23 21:15:50 +0900 (Tue, 23 Nov 2010)
Log Message:
-----------
UserStreamメニューの動作を修正
Modified Paths:
--------------
branches/UserStream/Tween/Tween.Designer.vb
branches/UserStream/Tween/Tween.resx
branches/UserStream/Tween/Tween.vb
-------------- next part --------------
Modified: branches/UserStream/Tween/Tween.Designer.vb
===================================================================
--- branches/UserStream/Tween/Tween.Designer.vb 2010-11-23 08:59:30 UTC (rev 1097)
+++ branches/UserStream/Tween/Tween.Designer.vb 2010-11-23 12:15:50 UTC (rev 1098)
@@ -209,6 +209,9 @@
Me.HashManageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.RtCountMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ListManageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.MenuItemUserStream = New System.Windows.Forms.ToolStripMenuItem()
+ Me.PauseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.StopToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MenuItemHelp = New System.Windows.Forms.ToolStripMenuItem()
Me.MatomeMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShortcutKeyListMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -269,10 +272,6 @@
Me.TimerRefreshIcon = New System.Windows.Forms.Timer(Me.components)
Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
- Me.MenuItemUserStream = New System.Windows.Forms.ToolStripMenuItem()
- Me.StartToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.PauseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.StopToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripContainer1.BottomToolStripPanel.SuspendLayout()
Me.ToolStripContainer1.ContentPanel.SuspendLayout()
Me.ToolStripContainer1.TopToolStripPanel.SuspendLayout()
@@ -1385,6 +1384,22 @@
Me.ListManageToolStripMenuItem.Name = "ListManageToolStripMenuItem"
resources.ApplyResources(Me.ListManageToolStripMenuItem, "ListManageToolStripMenuItem")
'
+ 'MenuItemUserStream
+ '
+ Me.MenuItemUserStream.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PauseToolStripMenuItem, Me.StopToolStripMenuItem})
+ resources.ApplyResources(Me.MenuItemUserStream, "MenuItemUserStream")
+ Me.MenuItemUserStream.Name = "MenuItemUserStream"
+ '
+ 'PauseToolStripMenuItem
+ '
+ resources.ApplyResources(Me.PauseToolStripMenuItem, "PauseToolStripMenuItem")
+ Me.PauseToolStripMenuItem.Name = "PauseToolStripMenuItem"
+ '
+ 'StopToolStripMenuItem
+ '
+ Me.StopToolStripMenuItem.Name = "StopToolStripMenuItem"
+ resources.ApplyResources(Me.StopToolStripMenuItem, "StopToolStripMenuItem")
+ '
'MenuItemHelp
'
Me.MenuItemHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MatomeMenuItem, Me.ShortcutKeyListMenuItem, Me.ToolStripSeparator16, Me.VerUpMenuItem, Me.ToolStripSeparator14, Me.ApiInfoMenuItem, Me.ToolStripSeparator7, Me.AboutMenuItem, Me.DebugModeToolStripMenuItem})
@@ -1690,27 +1705,6 @@
'
Me.OpenFileDialog1.FileName = "OpenFileDialog1"
'
- 'MenuItemUserStream
- '
- Me.MenuItemUserStream.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StartToolStripMenuItem, Me.PauseToolStripMenuItem, Me.StopToolStripMenuItem})
- Me.MenuItemUserStream.Name = "MenuItemUserStream"
- resources.ApplyResources(Me.MenuItemUserStream, "MenuItemUserStream")
- '
- 'StartToolStripMenuItem
- '
- Me.StartToolStripMenuItem.Name = "StartToolStripMenuItem"
- resources.ApplyResources(Me.StartToolStripMenuItem, "StartToolStripMenuItem")
- '
- 'PauseToolStripMenuItem
- '
- resources.ApplyResources(Me.PauseToolStripMenuItem, "PauseToolStripMenuItem")
- Me.PauseToolStripMenuItem.Name = "PauseToolStripMenuItem"
- '
- 'StopToolStripMenuItem
- '
- Me.StopToolStripMenuItem.Name = "StopToolStripMenuItem"
- resources.ApplyResources(Me.StopToolStripMenuItem, "StopToolStripMenuItem")
- '
'TweenMain
'
Me.AllowDrop = True
@@ -2006,7 +2000,6 @@
Friend WithEvents ToolStripStatusLabel1 As System.Windows.Forms.ToolStripStatusLabel
Friend WithEvents CopyUserIdStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents MenuItemUserStream As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents StartToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents PauseToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents StopToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Modified: branches/UserStream/Tween/Tween.resx
===================================================================
--- branches/UserStream/Tween/Tween.resx 2010-11-23 08:59:30 UTC (rev 1097)
+++ branches/UserStream/Tween/Tween.resx 2010-11-23 12:15:50 UTC (rev 1098)
@@ -382,7 +382,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="ListTab.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 213</value>
+ <value>570, 217</value>
</data>
<data name="ListTab.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -406,7 +406,7 @@
<value>0, 0</value>
</data>
<data name="TimelinePanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 213</value>
+ <value>570, 217</value>
</data>
<data name="TimelinePanel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -436,7 +436,7 @@
<value>0, 0</value>
</data>
<data name="ImageSelectedPicture.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 185</value>
+ <value>570, 189</value>
</data>
<data name="ImageSelectedPicture.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>Zoom</value>
@@ -640,7 +640,7 @@
<value>Bottom</value>
</data>
<data name="ImagePathPanel.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 185</value>
+ <value>0, 189</value>
</data>
<data name="ImagePathPanel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
@@ -670,7 +670,7 @@
<value>0, 0</value>
</data>
<data name="ImageSelectionPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 213</value>
+ <value>570, 217</value>
</data>
<data name="ImageSelectionPanel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -697,7 +697,7 @@
<value>0, 0</value>
</data>
<data name="ProfilePanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 213</value>
+ <value>570, 217</value>
</data>
<data name="ProfilePanel.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -1027,7 +1027,7 @@
<value>59, 20</value>
</data>
<data name="PostBrowser.Size" type="System.Drawing.Size, System.Drawing">
- <value>508, 74</value>
+ <value>508, 70</value>
</data>
<data name="PostBrowser.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -1132,7 +1132,7 @@
<value>2</value>
</data>
<data name="TableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 97</value>
+ <value>570, 93</value>
</data>
<data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -1270,10 +1270,10 @@
<value>19</value>
</data>
<data name="SplitContainer2.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 124</value>
+ <value>570, 120</value>
</data>
<data name="SplitContainer2.SplitterDistance" type="System.Int32, mscorlib">
- <value>97</value>
+ <value>93</value>
</data>
<data name="SplitContainer2.SplitterWidth" type="System.Int32, mscorlib">
<value>2</value>
@@ -1315,7 +1315,7 @@
<value>0, 0</value>
</data>
<data name="PreviewPicture.Size" type="System.Drawing.Size, System.Drawing">
- <value>77, 126</value>
+ <value>194, 122</value>
</data>
<data name="PreviewPicture.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>Zoom</value>
@@ -1342,10 +1342,10 @@
<value>Off</value>
</data>
<data name="PreviewScrollBar.Location" type="System.Drawing.Point, System.Drawing">
- <value>77, 0</value>
+ <value>194, 0</value>
</data>
<data name="PreviewScrollBar.Size" type="System.Drawing.Size, System.Drawing">
- <value>17, 126</value>
+ <value>17, 122</value>
</data>
<data name="PreviewScrollBar.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1375,7 +1375,7 @@
<value>1</value>
</data>
<data name="SplitContainer3.Size" type="System.Drawing.Size, System.Drawing">
- <value>570, 124</value>
+ <value>570, 120</value>
</data>
<data name="SplitContainer3.SplitterDistance" type="System.Int32, mscorlib">
<value>355</value>
@@ -1414,7 +1414,7 @@
<value>574, 347</value>
</data>
<data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
- <value>217</value>
+ <value>221</value>
</data>
<data name="SplitContainer1.SplitterWidth" type="System.Int32, mscorlib">
<value>2</value>
@@ -2079,12 +2079,6 @@
<data name="MenuItemCommand.Text" xml:space="preserve">
<value>その他機能(&C)</value>
</data>
- <data name="StartToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>152, 22</value>
- </data>
- <data name="StartToolStripMenuItem.Text" xml:space="preserve">
- <value>Start</value>
- </data>
<data name="PauseToolStripMenuItem.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@@ -2100,6 +2094,9 @@
<data name="StopToolStripMenuItem.Text" xml:space="preserve">
<value>Stop</value>
</data>
+ <data name="MenuItemUserStream.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
<data name="MenuItemUserStream.Size" type="System.Drawing.Size, System.Drawing">
<value>91, 22</value>
</data>
@@ -3423,6 +3420,24 @@
<data name=">>ListManageToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>MenuItemUserStream.Name" xml:space="preserve">
+ <value>MenuItemUserStream</value>
+ </data>
+ <data name=">>MenuItemUserStream.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>PauseToolStripMenuItem.Name" xml:space="preserve">
+ <value>PauseToolStripMenuItem</value>
+ </data>
+ <data name=">>PauseToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>StopToolStripMenuItem.Name" xml:space="preserve">
+ <value>StopToolStripMenuItem</value>
+ </data>
+ <data name=">>StopToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>MenuItemHelp.Name" xml:space="preserve">
<value>MenuItemHelp</value>
</data>
@@ -3771,30 +3786,6 @@
<data name=">>ToolTip1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>MenuItemUserStream.Name" xml:space="preserve">
- <value>MenuItemUserStream</value>
- </data>
- <data name=">>MenuItemUserStream.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>StartToolStripMenuItem.Name" xml:space="preserve">
- <value>StartToolStripMenuItem</value>
- </data>
- <data name=">>StartToolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>PauseToolStripMenuItem.Name" xml:space="preserve">
- <value>PauseToolStripMenuItem</value>
- </data>
- <data name=">>PauseToolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>StopToolStripMenuItem.Name" xml:space="preserve">
- <value>StopToolStripMenuItem</value>
- </data>
- <data name=">>StopToolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name=">>$this.Name" xml:space="preserve">
<value>TweenMain</value>
</data>
Modified: branches/UserStream/Tween/Tween.vb
===================================================================
--- branches/UserStream/Tween/Tween.vb 2010-11-23 08:59:30 UTC (rev 1097)
+++ branches/UserStream/Tween/Tween.vb 2010-11-23 12:15:50 UTC (rev 1098)
@@ -8172,8 +8172,8 @@
AddHandler tw.UserStreamPaused, AddressOf tw_UserStreamPaused
PauseToolStripMenuItem.Text = "&Pause"
PauseToolStripMenuItem.Enabled = False
- StartToolStripMenuItem.Text = "&Start"
- StartToolStripMenuItem.Enabled = True
+ StopToolStripMenuItem.Text = "&Start"
+ StopToolStripMenuItem.Enabled = True
tw.StartUserStream()
TimerTimeline.Enabled = True
End Sub
@@ -9600,8 +9600,8 @@
MenuItemUserStream.Enabled = True
PauseToolStripMenuItem.Text = "&Pause"
PauseToolStripMenuItem.Enabled = True
- StartToolStripMenuItem.Text = "&Stop"
- StartToolStripMenuItem.Enabled = True
+ StopToolStripMenuItem.Text = "&Stop"
+ StopToolStripMenuItem.Enabled = True
End Sub
Private Sub tw_UserStreamStopped()
@@ -9614,8 +9614,8 @@
MenuItemUserStream.Enabled = True
PauseToolStripMenuItem.Text = "&Pause"
PauseToolStripMenuItem.Enabled = False
- StartToolStripMenuItem.Text = "&Start"
- StartToolStripMenuItem.Enabled = True
+ StopToolStripMenuItem.Text = "&Start"
+ StopToolStripMenuItem.Enabled = True
End Sub
Private Sub tw_UserStreamPaused()
@@ -9628,17 +9628,17 @@
MenuItemUserStream.Enabled = True
PauseToolStripMenuItem.Text = "&Resume"
PauseToolStripMenuItem.Enabled = True
- StartToolStripMenuItem.Text = "&Stop"
- StartToolStripMenuItem.Enabled = True
+ StopToolStripMenuItem.Text = "&Stop"
+ StopToolStripMenuItem.Enabled = True
End Sub
Private Sub PauseToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles PauseToolStripMenuItem.Click
- PauseToolStripMenuItem.Enabled = False
+ MenuItemUserStream.Enabled = False
tw.PauseUserStream()
End Sub
Private Sub StopToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles StopToolStripMenuItem.Click
- StopToolStripMenuItem.Enabled = False
+ MenuItemUserStream.Enabled = False
tw.StartUserStream()
End Sub
End Class