svnno****@sourc*****
svnno****@sourc*****
2011年 3月 24日 (木) 20:30:42 JST
Revision: 1498
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1498
Author: f_swallow
Date: 2011-03-24 20:30:42 +0900 (Thu, 24 Mar 2011)
Log Message:
-----------
・All Refresh Stopの位置をファイルのメニューの下に
・UserStreamを有効にした場合はAllRefreshStopを解除
Modified Paths:
--------------
trunk/Tween/Tween.Designer.vb
trunk/Tween/Tween.vb
-------------- next part --------------
Modified: trunk/Tween/Tween.Designer.vb
===================================================================
--- trunk/Tween/Tween.Designer.vb 2011-03-21 11:15:32 UTC (rev 1497)
+++ trunk/Tween/Tween.Designer.vb 2011-03-24 11:30:42 UTC (rev 1498)
@@ -233,7 +233,6 @@
Me.AllrepliesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator42 = New System.Windows.Forms.ToolStripSeparator()
Me.EventViewerMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.StopRefreshAllMenuItem = 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()
@@ -301,6 +300,8 @@
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.StopRefreshAllMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator43 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripContainer1.BottomToolStripPanel.SuspendLayout()
Me.ToolStripContainer1.ContentPanel.SuspendLayout()
Me.ToolStripContainer1.TopToolStripPanel.SuspendLayout()
@@ -967,7 +968,7 @@
'
'MenuItemFile
'
- Me.MenuItemFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SettingFileMenuItem, Me.ToolStripSeparator21, Me.SaveFileMenuItem, Me.ToolStripSeparator23, Me.NotifyFileMenuItem, Me.PlaySoundFileMenuItem, Me.LockListFileMenuItem, Me.ToolStripSeparator24, Me.TweenRestartMenuItem, Me.EndFileMenuItem})
+ Me.MenuItemFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SettingFileMenuItem, Me.ToolStripSeparator21, Me.SaveFileMenuItem, Me.ToolStripSeparator23, Me.NotifyFileMenuItem, Me.PlaySoundFileMenuItem, Me.LockListFileMenuItem, Me.ToolStripSeparator43, Me.StopRefreshAllMenuItem, Me.ToolStripSeparator24, Me.TweenRestartMenuItem, Me.EndFileMenuItem})
Me.MenuItemFile.Name = "MenuItemFile"
resources.ApplyResources(Me.MenuItemFile, "MenuItemFile")
'
@@ -1498,7 +1499,7 @@
'
'MenuItemUserStream
'
- Me.MenuItemUserStream.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StopToolStripMenuItem, Me.ToolStripSeparator40, Me.TrackToolStripMenuItem, Me.AllrepliesToolStripMenuItem, Me.ToolStripSeparator42, Me.EventViewerMenuItem, Me.StopRefreshAllMenuItem})
+ Me.MenuItemUserStream.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StopToolStripMenuItem, Me.ToolStripSeparator40, Me.TrackToolStripMenuItem, Me.AllrepliesToolStripMenuItem, Me.ToolStripSeparator42, Me.EventViewerMenuItem})
resources.ApplyResources(Me.MenuItemUserStream, "MenuItemUserStream")
Me.MenuItemUserStream.Name = "MenuItemUserStream"
'
@@ -1534,12 +1535,6 @@
Me.EventViewerMenuItem.Name = "EventViewerMenuItem"
resources.ApplyResources(Me.EventViewerMenuItem, "EventViewerMenuItem")
'
- 'StopRefreshAllMenuItem
- '
- Me.StopRefreshAllMenuItem.CheckOnClick = True
- Me.StopRefreshAllMenuItem.Name = "StopRefreshAllMenuItem"
- resources.ApplyResources(Me.StopRefreshAllMenuItem, "StopRefreshAllMenuItem")
- '
'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})
@@ -1880,6 +1875,17 @@
'
Me.OpenFileDialog1.FileName = "OpenFileDialog1"
'
+ 'StopRefreshAllMenuItem
+ '
+ Me.StopRefreshAllMenuItem.CheckOnClick = True
+ Me.StopRefreshAllMenuItem.Name = "StopRefreshAllMenuItem"
+ resources.ApplyResources(Me.StopRefreshAllMenuItem, "StopRefreshAllMenuItem")
+ '
+ 'ToolStripSeparator43
+ '
+ Me.ToolStripSeparator43.Name = "ToolStripSeparator43"
+ resources.ApplyResources(Me.ToolStripSeparator43, "ToolStripSeparator43")
+ '
'TweenMain
'
Me.AllowDrop = True
@@ -2203,6 +2209,7 @@
Friend WithEvents UserTimelineToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents UserFavorareToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents SelectionTranslationToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ToolStripSeparator43 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents StopRefreshAllMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents OpenUserSpecifiedUrlMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents OpenUserSpecifiedUrlMenuItem2 As System.Windows.Forms.ToolStripMenuItem
Modified: trunk/Tween/Tween.vb
===================================================================
--- trunk/Tween/Tween.vb 2011-03-21 11:15:32 UTC (rev 1497)
+++ trunk/Tween/Tween.vb 2011-03-24 11:30:42 UTC (rev 1498)
@@ -10080,6 +10080,10 @@
Private Sub StopToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles StopToolStripMenuItem.Click
MenuItemUserStream.Enabled = False
+ If StopRefreshAllMenuItem.Checked Then
+ StopRefreshAllMenuItem.Checked = False
+ Exit Sub
+ End If
If Me._isActiveUserstream Then
tw.StopUserStream()
Else
@@ -10257,7 +10261,7 @@
TimerTimeline.Enabled = isEnable
End Sub
- Private Sub StopRefreshAllMenuItem_CheckedChanged(sender As Object, e As System.EventArgs) Handles StopRefreshAllMenuItem.CheckedChanged
+ Private Sub StopRefreshAllMenuItem_CheckedChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles StopRefreshAllMenuItem.CheckedChanged
TimelineRefreshEnableChange(Not StopRefreshAllMenuItem.Checked)
End Sub