UserUpdateイベントのチェックが正しく反映されないバグ修正

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

diff --git a/Tween/AppendSettingDialog.Designer.vb b/Tween/AppendSettingDialog.Designer.vb
index 02ca5c6..65ba797 100644 (file)
--- a/Tween/AppendSettingDialog.Designer.vb
+++ b/Tween/AppendSettingDialog.Designer.vb
@@ -31,7 +31,6 @@ Partial Class AppendSettingDialog
         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 @@ Partial Class AppendSettingDialog
         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 @@ Partial Class AppendSettingDialog
         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 @@ Partial Class AppendSettingDialog
     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

diff --git a/Tween/AppendSettingDialog.resx b/Tween/AppendSettingDialog.resx
index d191a23..ec35fc4 100644 (file)
--- a/Tween/AppendSettingDialog.resx
+++ b/Tween/AppendSettingDialog.resx
@@ -389,36 +389,6 @@
   <data name="&gt;&gt;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="&gt;&gt;CheckDeleteEvent.Name" xml:space="preserve">
-    <value>CheckDeleteEvent</value>
-  </data>
-  <data name="&gt;&gt;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="&gt;&gt;CheckDeleteEvent.Parent" xml:space="preserve">
-    <value>NotifyPanel</value>
-  </data>
-  <data name="&gt;&gt;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="&gt;&gt;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="&gt;&gt;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="&gt;&gt;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="&gt;&gt;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="&gt;&gt;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="&gt;&gt;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="&gt;&gt;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="&gt;&gt;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>

diff --git a/Tween/AppendSettingDialog.vb b/Tween/AppendSettingDialog.vb
index 62b58f1..8f020d1 100644 (file)
--- a/Tween/AppendSettingDialog.vb
+++ b/Tween/AppendSettingDialog.vb
@@ -2497,10 +2497,6 @@ Public Class AppendSettingDialog
             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 @@ Public Class AppendSettingDialog
         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