svnno****@sourc*****
svnno****@sourc*****
2011年 2月 3日 (木) 17:09:59 JST
Revision: 1436
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1436
Author: syo68k
Date: 2011-02-03 17:09:59 +0900 (Thu, 03 Feb 2011)
Log Message:
-----------
UserUpdateイベントのチェックが正しく反映されないバグ修正
Modified Paths:
--------------
trunk/Tween/AppendSettingDialog.Designer.vb
trunk/Tween/AppendSettingDialog.resx
trunk/Tween/AppendSettingDialog.vb
-------------- next part --------------
Modified: trunk/Tween/AppendSettingDialog.Designer.vb
===================================================================
--- trunk/Tween/AppendSettingDialog.Designer.vb 2011-02-01 02:58:07 UTC (rev 1435)
+++ trunk/Tween/AppendSettingDialog.Designer.vb 2011-02-03 08:09:59 UTC (rev 1436)
@@ -31,7 +31,6 @@
Me.ComboBoxEventNotifySound = New System.Windows.Forms.ComboBox()
Me.CheckFavEventUnread = New System.Windows.Forms.CheckBox()
Me.CheckListCreatedEvent = New System.Windows.Forms.CheckBox()
- Me.CheckDeleteEvent = New System.Windows.Forms.CheckBox()
Me.CheckBlockEvent = New System.Windows.Forms.CheckBox()
Me.CheckForceEventNotify = New System.Windows.Forms.CheckBox()
Me.CheckListMemberRemovedEvent = New System.Windows.Forms.CheckBox()
@@ -336,7 +335,6 @@
Me.NotifyPanel.Controls.Add(Me.ComboBoxEventNotifySound)
Me.NotifyPanel.Controls.Add(Me.CheckFavEventUnread)
Me.NotifyPanel.Controls.Add(Me.CheckListCreatedEvent)
- Me.NotifyPanel.Controls.Add(Me.CheckDeleteEvent)
Me.NotifyPanel.Controls.Add(Me.CheckBlockEvent)
Me.NotifyPanel.Controls.Add(Me.CheckForceEventNotify)
Me.NotifyPanel.Controls.Add(Me.CheckListMemberRemovedEvent)
@@ -383,14 +381,6 @@
Me.CheckListCreatedEvent.Name = "CheckListCreatedEvent"
Me.CheckListCreatedEvent.UseVisualStyleBackColor = True
'
- 'CheckDeleteEvent
- '
- resources.ApplyResources(Me.CheckDeleteEvent, "CheckDeleteEvent")
- Me.CheckDeleteEvent.Checked = True
- Me.CheckDeleteEvent.CheckState = System.Windows.Forms.CheckState.Checked
- Me.CheckDeleteEvent.Name = "CheckDeleteEvent"
- Me.CheckDeleteEvent.UseVisualStyleBackColor = True
- '
'CheckBlockEvent
'
resources.ApplyResources(Me.CheckBlockEvent, "CheckBlockEvent")
@@ -2207,7 +2197,6 @@
Friend WithEvents ListTextCountApi As System.Windows.Forms.TextBox
Friend WithEvents Label25 As System.Windows.Forms.Label
Friend WithEvents CheckListCreatedEvent As System.Windows.Forms.CheckBox
- Friend WithEvents CheckDeleteEvent As System.Windows.Forms.CheckBox
Friend WithEvents CheckFavEventUnread As System.Windows.Forms.CheckBox
Friend WithEvents ComboBoxTranslateLanguage As System.Windows.Forms.ComboBox
Friend WithEvents Label29 As System.Windows.Forms.Label
Modified: trunk/Tween/AppendSettingDialog.resx
===================================================================
--- trunk/Tween/AppendSettingDialog.resx 2011-02-01 02:58:07 UTC (rev 1435)
+++ trunk/Tween/AppendSettingDialog.resx 2011-02-03 08:09:59 UTC (rev 1436)
@@ -389,36 +389,6 @@
<data name=">>CheckListCreatedEvent.ZOrder" xml:space="preserve">
<value>4</value>
</data>
- <data name="CheckDeleteEvent.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="CheckDeleteEvent.Location" type="System.Drawing.Point, System.Drawing">
- <value>40, 197</value>
- </data>
- <data name="CheckDeleteEvent.Size" type="System.Drawing.Size, System.Drawing">
- <value>252, 16</value>
- </data>
- <data name="CheckDeleteEvent.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
- </data>
- <data name="CheckDeleteEvent.Text" xml:space="preserve">
- <value>発言または自分宛に送信されたDMが削除された</value>
- </data>
- <data name="CheckDeleteEvent.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name=">>CheckDeleteEvent.Name" xml:space="preserve">
- <value>CheckDeleteEvent</value>
- </data>
- <data name=">>CheckDeleteEvent.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>CheckDeleteEvent.Parent" xml:space="preserve">
- <value>NotifyPanel</value>
- </data>
- <data name=">>CheckDeleteEvent.ZOrder" xml:space="preserve">
- <value>5</value>
- </data>
<data name="CheckBlockEvent.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -444,7 +414,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckBlockEvent.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>5</value>
</data>
<data name="CheckForceEventNotify.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -471,7 +441,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckForceEventNotify.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>6</value>
</data>
<data name="CheckListMemberRemovedEvent.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -498,7 +468,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckListMemberRemovedEvent.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>7</value>
</data>
<data name="CheckListMemberAddedEvent.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -525,7 +495,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckListMemberAddedEvent.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>8</value>
</data>
<data name="CheckFollowEvent.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -552,7 +522,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckFollowEvent.ZOrder" xml:space="preserve">
- <value>10</value>
+ <value>9</value>
</data>
<data name="CheckUnfavoritesEvent.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -579,7 +549,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckUnfavoritesEvent.ZOrder" xml:space="preserve">
- <value>11</value>
+ <value>10</value>
</data>
<data name="CheckFavoritesEvent.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -606,7 +576,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckFavoritesEvent.ZOrder" xml:space="preserve">
- <value>12</value>
+ <value>11</value>
</data>
<data name="CheckEventNotify.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -636,7 +606,7 @@
<value>NotifyPanel</value>
</data>
<data name=">>CheckEventNotify.ZOrder" xml:space="preserve">
- <value>13</value>
+ <value>12</value>
</data>
<data name="NotifyPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
Modified: trunk/Tween/AppendSettingDialog.vb
===================================================================
--- trunk/Tween/AppendSettingDialog.vb 2011-02-01 02:58:07 UTC (rev 1435)
+++ trunk/Tween/AppendSettingDialog.vb 2011-02-03 08:09:59 UTC (rev 1436)
@@ -2497,10 +2497,6 @@
evt = evt Or EVENTTYPE.UserUpdate
End If
- If CheckDeleteEvent.Checked Then
- evt = evt Or EVENTTYPE.Deleted
- End If
-
If CheckListCreatedEvent.Checked Then
evt = evt Or EVENTTYPE.ListCreated
End If
@@ -2529,11 +2525,11 @@
CheckBlockEvent.Checked = CBool(evt And EVENTTYPE.Block)
CheckBlockEvent.Enabled = rootEnabled
- CheckDeleteEvent.Checked = CBool(evt And EVENTTYPE.Deleted)
- CheckDeleteEvent.Enabled = rootEnabled
-
CheckListCreatedEvent.Checked = CBool(evt And EVENTTYPE.ListCreated)
CheckListCreatedEvent.Enabled = rootEnabled
+
+ CheckUserUpdateEvent.Checked = CBool(evt And EVENTTYPE.UserUpdate)
+ CheckUserUpdateEvent.Enabled = rootEnabled
End Sub
Private Sub CheckForceEventNotify_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CheckForceEventNotify.CheckedChanged