From 5d1fc3a7677fed6f9013f72fcaf421beb32e4b59 Mon Sep 17 00:00:00 2001 From: f_swallow Date: Thu, 24 Mar 2011 11:30:42 +0000 Subject: [PATCH] =?utf8?q?=E3=83=BBAll=20Refresh=20Stop=E3=81=AE=E4=BD=8D?= =?utf8?q?=E7=BD=AE=E3=82=92=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE?= =?utf8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E4=B8=8B=E3=81=AB?= =?utf8?q?=20=E3=83=BBUserStream=E3=82=92=E6=9C=89=E5=8A=B9=E3=81=AB?= =?utf8?q?=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AFAllRefreshStop?= =?utf8?q?=E3=82=92=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@1498 e39ad16e-3079-482e-bb30-4b4d378143b6 --- Tween/Tween.Designer.vb | 25 ++++++++++++++++--------- Tween/Tween.vb | 6 +++++- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb index 30c100af..0d8071bd 100644 --- a/Tween/Tween.Designer.vb +++ b/Tween/Tween.Designer.vb @@ -233,7 +233,6 @@ Partial Class TweenMain 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 @@ Partial Class TweenMain 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 @@ Partial Class TweenMain ' '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 @@ Partial Class TweenMain ' '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 @@ Partial Class TweenMain 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 @@ Partial Class TweenMain ' 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 @@ Partial Class TweenMain 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 diff --git a/Tween/Tween.vb b/Tween/Tween.vb index 0d33d3e7..075414e3 100644 --- a/Tween/Tween.vb +++ b/Tween/Tween.vb @@ -10080,6 +10080,10 @@ RETRY: 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 @@ RETRY: 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 -- 2.11.0