svnno****@sourc*****
svnno****@sourc*****
2011年 1月 29日 (土) 13:54:45 JST
Revision: 1419
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1419
Author: syo68k
Date: 2011-01-29 13:54:45 +0900 (Sat, 29 Jan 2011)
Log Message:
-----------
・イベントダイアログをモーダルにしていたのをやめた
・コントロールのAnchor修正
Modified Paths:
--------------
trunk/Tween/EventViewerDialog.Designer.vb
trunk/Tween/EventViewerDialog.resx
trunk/Tween/Tween.vb
-------------- next part --------------
Modified: trunk/Tween/EventViewerDialog.Designer.vb
===================================================================
--- trunk/Tween/EventViewerDialog.Designer.vb 2011-01-28 11:16:40 UTC (rev 1418)
+++ trunk/Tween/EventViewerDialog.Designer.vb 2011-01-29 04:54:45 UTC (rev 1419)
@@ -22,6 +22,7 @@
'コード エディターを使って変更しないでください。
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(EventViewerDialog))
Me.OK_Button = New System.Windows.Forms.Button()
Me.CheckExcludeMyEvent = New System.Windows.Forms.CheckBox()
Me.ButtonRefresh = New System.Windows.Forms.Button()
@@ -49,39 +50,25 @@
'
'OK_Button
'
- Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ resources.ApplyResources(Me.OK_Button, "OK_Button")
Me.OK_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.OK_Button.Location = New System.Drawing.Point(659, 301)
Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New System.Drawing.Size(67, 21)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
'
'CheckExcludeMyEvent
'
- Me.CheckExcludeMyEvent.AutoSize = True
- Me.CheckExcludeMyEvent.Location = New System.Drawing.Point(12, 249)
+ resources.ApplyResources(Me.CheckExcludeMyEvent, "CheckExcludeMyEvent")
Me.CheckExcludeMyEvent.Name = "CheckExcludeMyEvent"
- Me.CheckExcludeMyEvent.Size = New System.Drawing.Size(197, 16)
- Me.CheckExcludeMyEvent.TabIndex = 2
- Me.CheckExcludeMyEvent.Text = "自分が発生させたイベントを除外する"
Me.CheckExcludeMyEvent.UseVisualStyleBackColor = True
'
'ButtonRefresh
'
- Me.ButtonRefresh.Location = New System.Drawing.Point(600, 261)
+ resources.ApplyResources(Me.ButtonRefresh, "ButtonRefresh")
Me.ButtonRefresh.Name = "ButtonRefresh"
- Me.ButtonRefresh.Size = New System.Drawing.Size(126, 21)
- Me.ButtonRefresh.TabIndex = 3
- Me.ButtonRefresh.Text = "最新の情報に更新"
Me.ButtonRefresh.UseVisualStyleBackColor = True
'
'TabEventType
'
- Me.TabEventType.Alignment = System.Windows.Forms.TabAlignment.Bottom
- Me.TabEventType.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ resources.ApplyResources(Me.TabEventType, "TabEventType")
Me.TabEventType.Controls.Add(Me.TabPageAll)
Me.TabEventType.Controls.Add(Me.TabPageFav)
Me.TabEventType.Controls.Add(Me.TabPageUnfav)
@@ -91,177 +78,120 @@
Me.TabEventType.Controls.Add(Me.TabPageListsCreated)
Me.TabEventType.Controls.Add(Me.TabPageBlock)
Me.TabEventType.Controls.Add(Me.TabPageUserUpdate)
- Me.TabEventType.Location = New System.Drawing.Point(12, 12)
Me.TabEventType.Name = "TabEventType"
Me.TabEventType.SelectedIndex = 0
- Me.TabEventType.Size = New System.Drawing.Size(714, 221)
- Me.TabEventType.TabIndex = 4
'
'TabPageAll
'
Me.TabPageAll.Controls.Add(Me.EventList)
- Me.TabPageAll.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageAll, "TabPageAll")
Me.TabPageAll.Name = "TabPageAll"
- Me.TabPageAll.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageAll.Size = New System.Drawing.Size(706, 195)
- Me.TabPageAll.TabIndex = 0
Me.TabPageAll.Tag = "All"
- Me.TabPageAll.Text = "全て"
Me.TabPageAll.UseVisualStyleBackColor = True
'
'EventList
'
Me.EventList.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader4})
- Me.EventList.Dock = System.Windows.Forms.DockStyle.Fill
+ resources.ApplyResources(Me.EventList, "EventList")
Me.EventList.FullRowSelect = True
- Me.EventList.Location = New System.Drawing.Point(3, 3)
Me.EventList.Name = "EventList"
- Me.EventList.Size = New System.Drawing.Size(700, 189)
- Me.EventList.TabIndex = 3
Me.EventList.UseCompatibleStateImageBehavior = False
Me.EventList.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
'
- Me.ColumnHeader1.Text = "Datetime"
- Me.ColumnHeader1.Width = 86
+ resources.ApplyResources(Me.ColumnHeader1, "ColumnHeader1")
'
'ColumnHeader2
'
- Me.ColumnHeader2.Text = "Type"
- Me.ColumnHeader2.Width = 90
+ resources.ApplyResources(Me.ColumnHeader2, "ColumnHeader2")
'
'ColumnHeader3
'
- Me.ColumnHeader3.Text = "Username"
- Me.ColumnHeader3.Width = 106
+ resources.ApplyResources(Me.ColumnHeader3, "ColumnHeader3")
'
'ColumnHeader4
'
- Me.ColumnHeader4.Text = "Target"
- Me.ColumnHeader4.Width = 360
+ resources.ApplyResources(Me.ColumnHeader4, "ColumnHeader4")
'
'TabPageFav
'
- Me.TabPageFav.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageFav, "TabPageFav")
Me.TabPageFav.Name = "TabPageFav"
- Me.TabPageFav.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageFav.Size = New System.Drawing.Size(706, 195)
- Me.TabPageFav.TabIndex = 1
Me.TabPageFav.Tag = "Favorite"
- Me.TabPageFav.Text = "Favorite"
Me.TabPageFav.UseVisualStyleBackColor = True
'
'TabPageUnfav
'
- Me.TabPageUnfav.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageUnfav, "TabPageUnfav")
Me.TabPageUnfav.Name = "TabPageUnfav"
- Me.TabPageUnfav.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageUnfav.Size = New System.Drawing.Size(706, 195)
- Me.TabPageUnfav.TabIndex = 2
Me.TabPageUnfav.Tag = "Unfavorite"
- Me.TabPageUnfav.Text = "Unfavorite"
Me.TabPageUnfav.UseVisualStyleBackColor = True
'
'TabPageFollow
'
- Me.TabPageFollow.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageFollow, "TabPageFollow")
Me.TabPageFollow.Name = "TabPageFollow"
- Me.TabPageFollow.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageFollow.Size = New System.Drawing.Size(706, 195)
- Me.TabPageFollow.TabIndex = 3
Me.TabPageFollow.Tag = "Follow"
- Me.TabPageFollow.Text = "Follow"
Me.TabPageFollow.UseVisualStyleBackColor = True
'
'TabPageAddLists
'
- Me.TabPageAddLists.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageAddLists, "TabPageAddLists")
Me.TabPageAddLists.Name = "TabPageAddLists"
- Me.TabPageAddLists.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageAddLists.Size = New System.Drawing.Size(706, 195)
- Me.TabPageAddLists.TabIndex = 4
Me.TabPageAddLists.Tag = "ListMemberAdded"
- Me.TabPageAddLists.Text = "ListsMemberAdded"
Me.TabPageAddLists.UseVisualStyleBackColor = True
'
'TabPageRemoveLists
'
- Me.TabPageRemoveLists.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageRemoveLists, "TabPageRemoveLists")
Me.TabPageRemoveLists.Name = "TabPageRemoveLists"
- Me.TabPageRemoveLists.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageRemoveLists.Size = New System.Drawing.Size(706, 195)
- Me.TabPageRemoveLists.TabIndex = 5
Me.TabPageRemoveLists.Tag = "ListMemberRemoved"
- Me.TabPageRemoveLists.Text = "ListsMemberRemoved"
Me.TabPageRemoveLists.UseVisualStyleBackColor = True
'
'TabPageListsCreated
'
- Me.TabPageListsCreated.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageListsCreated, "TabPageListsCreated")
Me.TabPageListsCreated.Name = "TabPageListsCreated"
- Me.TabPageListsCreated.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageListsCreated.Size = New System.Drawing.Size(706, 195)
- Me.TabPageListsCreated.TabIndex = 6
Me.TabPageListsCreated.Tag = "ListCreated"
- Me.TabPageListsCreated.Text = "ListsCreated"
Me.TabPageListsCreated.UseVisualStyleBackColor = True
'
'TabPageBlock
'
- Me.TabPageBlock.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageBlock, "TabPageBlock")
Me.TabPageBlock.Name = "TabPageBlock"
- Me.TabPageBlock.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageBlock.Size = New System.Drawing.Size(706, 195)
- Me.TabPageBlock.TabIndex = 7
Me.TabPageBlock.Tag = "Block"
- Me.TabPageBlock.Text = "Block"
Me.TabPageBlock.UseVisualStyleBackColor = True
'
'TabPageUserUpdate
'
- Me.TabPageUserUpdate.Location = New System.Drawing.Point(4, 4)
+ resources.ApplyResources(Me.TabPageUserUpdate, "TabPageUserUpdate")
Me.TabPageUserUpdate.Name = "TabPageUserUpdate"
- Me.TabPageUserUpdate.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPageUserUpdate.Size = New System.Drawing.Size(706, 195)
- Me.TabPageUserUpdate.TabIndex = 8
Me.TabPageUserUpdate.Tag = "UserUpdate"
- Me.TabPageUserUpdate.Text = "UserUpdate"
Me.TabPageUserUpdate.UseVisualStyleBackColor = True
'
'TextBoxKeyword
'
- Me.TextBoxKeyword.Location = New System.Drawing.Point(142, 278)
+ resources.ApplyResources(Me.TextBoxKeyword, "TextBoxKeyword")
Me.TextBoxKeyword.Name = "TextBoxKeyword"
- Me.TextBoxKeyword.Size = New System.Drawing.Size(231, 19)
- Me.TextBoxKeyword.TabIndex = 5
'
'CheckRegex
'
- Me.CheckRegex.AutoSize = True
- Me.CheckRegex.Location = New System.Drawing.Point(12, 304)
+ resources.ApplyResources(Me.CheckRegex, "CheckRegex")
Me.CheckRegex.Name = "CheckRegex"
- Me.CheckRegex.Size = New System.Drawing.Size(72, 16)
- Me.CheckRegex.TabIndex = 6
- Me.CheckRegex.Text = "正規表現"
Me.CheckRegex.UseVisualStyleBackColor = True
'
'CheckBoxFilter
'
- Me.CheckBoxFilter.AutoSize = True
- Me.CheckBoxFilter.Location = New System.Drawing.Point(12, 280)
+ resources.ApplyResources(Me.CheckBoxFilter, "CheckBoxFilter")
Me.CheckBoxFilter.Name = "CheckBoxFilter"
- Me.CheckBoxFilter.Size = New System.Drawing.Size(124, 16)
- Me.CheckBoxFilter.TabIndex = 7
- Me.CheckBoxFilter.Text = "キーワードで絞り込む"
Me.CheckBoxFilter.UseVisualStyleBackColor = True
'
'EventViewerDialog
'
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
+ resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.OK_Button
- Me.ClientSize = New System.Drawing.Size(738, 334)
Me.Controls.Add(Me.CheckBoxFilter)
Me.Controls.Add(Me.CheckRegex)
Me.Controls.Add(Me.TextBoxKeyword)
@@ -270,13 +200,8 @@
Me.Controls.Add(Me.CheckExcludeMyEvent)
Me.Controls.Add(Me.OK_Button)
Me.DoubleBuffered = True
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow
- Me.MaximizeBox = False
- Me.MinimizeBox = False
Me.Name = "EventViewerDialog"
Me.ShowInTaskbar = False
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
- Me.Text = "Events"
Me.TabEventType.ResumeLayout(False)
Me.TabPageAll.ResumeLayout(False)
Me.ResumeLayout(False)
Modified: trunk/Tween/EventViewerDialog.resx
===================================================================
--- trunk/Tween/EventViewerDialog.resx 2011-01-28 11:16:40 UTC (rev 1418)
+++ trunk/Tween/EventViewerDialog.resx 2011-01-29 04:54:45 UTC (rev 1419)
@@ -117,4 +117,538 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="OK_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Right</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
+ <value>659, 301</value>
+ </data>
+ <data name="OK_Button.Size" type="System.Drawing.Size, System.Drawing">
+ <value>67, 21</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="OK_Button.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="OK_Button.Text" xml:space="preserve">
+ <value>OK</value>
+ </data>
+ <data name=">>OK_Button.Name" xml:space="preserve">
+ <value>OK_Button</value>
+ </data>
+ <data name=">>OK_Button.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>OK_Button.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>OK_Button.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="CheckExcludeMyEvent.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Left</value>
+ </data>
+ <data name="CheckExcludeMyEvent.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="CheckExcludeMyEvent.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 249</value>
+ </data>
+ <data name="CheckExcludeMyEvent.Size" type="System.Drawing.Size, System.Drawing">
+ <value>197, 16</value>
+ </data>
+ <data name="CheckExcludeMyEvent.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="CheckExcludeMyEvent.Text" xml:space="preserve">
+ <value>自分が発生させたイベントを除外する</value>
+ </data>
+ <data name=">>CheckExcludeMyEvent.Name" xml:space="preserve">
+ <value>CheckExcludeMyEvent</value>
+ </data>
+ <data name=">>CheckExcludeMyEvent.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=">>CheckExcludeMyEvent.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>CheckExcludeMyEvent.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="ButtonRefresh.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Right</value>
+ </data>
+ <data name="ButtonRefresh.Location" type="System.Drawing.Point, System.Drawing">
+ <value>600, 261</value>
+ </data>
+ <data name="ButtonRefresh.Size" type="System.Drawing.Size, System.Drawing">
+ <value>126, 21</value>
+ </data>
+ <data name="ButtonRefresh.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="ButtonRefresh.Text" xml:space="preserve">
+ <value>最新の情報に更新</value>
+ </data>
+ <data name=">>ButtonRefresh.Name" xml:space="preserve">
+ <value>ButtonRefresh</value>
+ </data>
+ <data name=">>ButtonRefresh.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>ButtonRefresh.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>ButtonRefresh.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="TabEventType.Alignment" type="System.Windows.Forms.TabAlignment, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="TabEventType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Bottom, Left, Right</value>
+ </data>
+ <data name="ColumnHeader1.Text" xml:space="preserve">
+ <value>Datetime</value>
+ </data>
+ <data name="ColumnHeader1.Width" type="System.Int32, mscorlib">
+ <value>86</value>
+ </data>
+ <data name="ColumnHeader2.Text" xml:space="preserve">
+ <value>Type</value>
+ </data>
+ <data name="ColumnHeader2.Width" type="System.Int32, mscorlib">
+ <value>90</value>
+ </data>
+ <data name="ColumnHeader3.Text" xml:space="preserve">
+ <value>Username</value>
+ </data>
+ <data name="ColumnHeader3.Width" type="System.Int32, mscorlib">
+ <value>106</value>
+ </data>
+ <data name="ColumnHeader4.Text" xml:space="preserve">
+ <value>Target</value>
+ </data>
+ <data name="ColumnHeader4.Width" type="System.Int32, mscorlib">
+ <value>360</value>
+ </data>
+ <data name="EventList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="EventList.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 3</value>
+ </data>
+ <data name="EventList.Size" type="System.Drawing.Size, System.Drawing">
+ <value>700, 189</value>
+ </data>
+ <data name="EventList.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>EventList.Name" xml:space="preserve">
+ <value>EventList</value>
+ </data>
+ <data name=">>EventList.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>EventList.Parent" xml:space="preserve">
+ <value>TabPageAll</value>
+ </data>
+ <data name=">>EventList.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="TabPageAll.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageAll.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageAll.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageAll.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="TabPageAll.Text" xml:space="preserve">
+ <value>全て</value>
+ </data>
+ <data name=">>TabPageAll.Name" xml:space="preserve">
+ <value>TabPageAll</value>
+ </data>
+ <data name=">>TabPageAll.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageAll.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageAll.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="TabPageFav.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageFav.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageFav.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageFav.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="TabPageFav.Text" xml:space="preserve">
+ <value>Favorite</value>
+ </data>
+ <data name=">>TabPageFav.Name" xml:space="preserve">
+ <value>TabPageFav</value>
+ </data>
+ <data name=">>TabPageFav.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageFav.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageFav.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="TabPageUnfav.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageUnfav.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageUnfav.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageUnfav.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="TabPageUnfav.Text" xml:space="preserve">
+ <value>Unfavorite</value>
+ </data>
+ <data name=">>TabPageUnfav.Name" xml:space="preserve">
+ <value>TabPageUnfav</value>
+ </data>
+ <data name=">>TabPageUnfav.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageUnfav.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageUnfav.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="TabPageFollow.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageFollow.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageFollow.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageFollow.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="TabPageFollow.Text" xml:space="preserve">
+ <value>Follow</value>
+ </data>
+ <data name=">>TabPageFollow.Name" xml:space="preserve">
+ <value>TabPageFollow</value>
+ </data>
+ <data name=">>TabPageFollow.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageFollow.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageFollow.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="TabPageAddLists.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageAddLists.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageAddLists.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageAddLists.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="TabPageAddLists.Text" xml:space="preserve">
+ <value>ListsMemberAdded</value>
+ </data>
+ <data name=">>TabPageAddLists.Name" xml:space="preserve">
+ <value>TabPageAddLists</value>
+ </data>
+ <data name=">>TabPageAddLists.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageAddLists.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageAddLists.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="TabPageRemoveLists.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageRemoveLists.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageRemoveLists.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageRemoveLists.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="TabPageRemoveLists.Text" xml:space="preserve">
+ <value>ListsMemberRemoved</value>
+ </data>
+ <data name=">>TabPageRemoveLists.Name" xml:space="preserve">
+ <value>TabPageRemoveLists</value>
+ </data>
+ <data name=">>TabPageRemoveLists.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageRemoveLists.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageRemoveLists.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="TabPageListsCreated.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageListsCreated.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageListsCreated.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageListsCreated.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="TabPageListsCreated.Text" xml:space="preserve">
+ <value>ListsCreated</value>
+ </data>
+ <data name=">>TabPageListsCreated.Name" xml:space="preserve">
+ <value>TabPageListsCreated</value>
+ </data>
+ <data name=">>TabPageListsCreated.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageListsCreated.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageListsCreated.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="TabPageBlock.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageBlock.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageBlock.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageBlock.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name="TabPageBlock.Text" xml:space="preserve">
+ <value>Block</value>
+ </data>
+ <data name=">>TabPageBlock.Name" xml:space="preserve">
+ <value>TabPageBlock</value>
+ </data>
+ <data name=">>TabPageBlock.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageBlock.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageBlock.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name="TabPageUserUpdate.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 4</value>
+ </data>
+ <data name="TabPageUserUpdate.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="TabPageUserUpdate.Size" type="System.Drawing.Size, System.Drawing">
+ <value>706, 195</value>
+ </data>
+ <data name="TabPageUserUpdate.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name="TabPageUserUpdate.Text" xml:space="preserve">
+ <value>UserUpdate</value>
+ </data>
+ <data name=">>TabPageUserUpdate.Name" xml:space="preserve">
+ <value>TabPageUserUpdate</value>
+ </data>
+ <data name=">>TabPageUserUpdate.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabPageUserUpdate.Parent" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabPageUserUpdate.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name="TabEventType.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 12</value>
+ </data>
+ <data name="TabEventType.Size" type="System.Drawing.Size, System.Drawing">
+ <value>714, 221</value>
+ </data>
+ <data name="TabEventType.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name=">>TabEventType.Name" xml:space="preserve">
+ <value>TabEventType</value>
+ </data>
+ <data name=">>TabEventType.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TabEventType.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>TabEventType.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="TextBoxKeyword.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Left</value>
+ </data>
+ <data name="TextBoxKeyword.Location" type="System.Drawing.Point, System.Drawing">
+ <value>142, 278</value>
+ </data>
+ <data name="TextBoxKeyword.Size" type="System.Drawing.Size, System.Drawing">
+ <value>231, 19</value>
+ </data>
+ <data name="TextBoxKeyword.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name=">>TextBoxKeyword.Name" xml:space="preserve">
+ <value>TextBoxKeyword</value>
+ </data>
+ <data name=">>TextBoxKeyword.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>TextBoxKeyword.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>TextBoxKeyword.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="CheckRegex.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Left</value>
+ </data>
+ <data name="CheckRegex.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="CheckRegex.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 304</value>
+ </data>
+ <data name="CheckRegex.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 16</value>
+ </data>
+ <data name="CheckRegex.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="CheckRegex.Text" xml:space="preserve">
+ <value>正規表現</value>
+ </data>
+ <data name=">>CheckRegex.Name" xml:space="preserve">
+ <value>CheckRegex</value>
+ </data>
+ <data name=">>CheckRegex.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=">>CheckRegex.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>CheckRegex.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="CheckBoxFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Left</value>
+ </data>
+ <data name="CheckBoxFilter.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="CheckBoxFilter.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 280</value>
+ </data>
+ <data name="CheckBoxFilter.Size" type="System.Drawing.Size, System.Drawing">
+ <value>124, 16</value>
+ </data>
+ <data name="CheckBoxFilter.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name="CheckBoxFilter.Text" xml:space="preserve">
+ <value>キーワードで絞り込む</value>
+ </data>
+ <data name=">>CheckBoxFilter.Name" xml:space="preserve">
+ <value>CheckBoxFilter</value>
+ </data>
+ <data name=">>CheckBoxFilter.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=">>CheckBoxFilter.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>CheckBoxFilter.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+ <value>6, 12</value>
+ </data>
+ <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+ <value>738, 334</value>
+ </data>
+ <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+ <value>CenterParent</value>
+ </data>
+ <data name="$this.Text" xml:space="preserve">
+ <value>Events</value>
+ </data>
+ <data name=">>ColumnHeader1.Name" xml:space="preserve">
+ <value>ColumnHeader1</value>
+ </data>
+ <data name=">>ColumnHeader1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>ColumnHeader2.Name" xml:space="preserve">
+ <value>ColumnHeader2</value>
+ </data>
+ <data name=">>ColumnHeader2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>ColumnHeader3.Name" xml:space="preserve">
+ <value>ColumnHeader3</value>
+ </data>
+ <data name=">>ColumnHeader3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>ColumnHeader4.Name" xml:space="preserve">
+ <value>ColumnHeader4</value>
+ </data>
+ <data name=">>ColumnHeader4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>$this.Name" xml:space="preserve">
+ <value>EventViewerDialog</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tween/Tween.vb
===================================================================
--- trunk/Tween/Tween.vb 2011-01-28 11:16:40 UTC (rev 1418)
+++ trunk/Tween/Tween.vb 2011-01-29 04:54:45 UTC (rev 1419)
@@ -95,12 +95,13 @@
Private SettingDialog As AppendSettingDialog = AppendSettingDialog.Instance '設定画面インスタンス
Private TabDialog As New TabsDialog 'タブ選択ダイアログインスタンス
Private SearchDialog As New SearchWord '検索画面インスタンス
- Private fDialog As New FilterDialog 'フィルター編集画面
+ Private fltDialog As New FilterDialog 'フィルター編集画面
Private UrlDialog As New OpenURL
Private dialogAsShieldicon As DialogAsShieldIcon ' シールドアイコン付きダイアログ
Public AtIdSupl As AtIdSupplement '@id補助
Public HashSupl As AtIdSupplement 'Hashtag補助
Public HashMgr As HashtagManage
+ Private evtDialog As New EventViewerDialog
'表示フォント、色、アイコン
Private _fntUnread As Font '未読用フォント
@@ -321,7 +322,7 @@
SettingDialog.Dispose()
TabDialog.Dispose()
SearchDialog.Dispose()
- fDialog.Dispose()
+ fltDialog.Dispose()
UrlDialog.Dispose()
_spaceKeyCanceler.Dispose()
If NIconAt IsNot Nothing Then NIconAt.Dispose()
@@ -518,7 +519,7 @@
SettingDialog.Owner = Me
SearchDialog.Owner = Me
- fDialog.Owner = Me
+ fltDialog.Owner = Me
TabDialog.Owner = Me
UrlDialog.Owner = Me
@@ -6725,8 +6726,8 @@
Private Sub FilterEditMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles FilterEditMenuItem.Click, EditRuleTbMenuItem.Click
If String.IsNullOrEmpty(_rclickTabName) Then _rclickTabName = _statuses.GetTabByType(TabUsageType.Home).TabName
- fDialog.SetCurrent(_rclickTabName)
- fDialog.ShowDialog()
+ fltDialog.SetCurrent(_rclickTabName)
+ fltDialog.ShowDialog()
Me.TopMost = SettingDialog.AlwaysTop
Try
@@ -6806,13 +6807,13 @@
'タブ選択（or追加）
If Not SelectTab(tabName) Then Exit Sub
- fDialog.SetCurrent(tabName)
+ fltDialog.SetCurrent(tabName)
If _statuses.Item(_curTab.Text, idx).RetweetedId = 0 Then
- fDialog.AddNewFilter(_statuses.Item(_curTab.Text, idx).ScreenName, _statuses.Item(_curTab.Text, idx).TextFromApi)
+ fltDialog.AddNewFilter(_statuses.Item(_curTab.Text, idx).ScreenName, _statuses.Item(_curTab.Text, idx).TextFromApi)
Else
- fDialog.AddNewFilter(_statuses.Item(_curTab.Text, idx).RetweetedBy, _statuses.Item(_curTab.Text, idx).TextFromApi)
+ fltDialog.AddNewFilter(_statuses.Item(_curTab.Text, idx).RetweetedBy, _statuses.Item(_curTab.Text, idx).TextFromApi)
End If
- fDialog.ShowDialog()
+ fltDialog.ShowDialog()
Me.TopMost = SettingDialog.AlwaysTop
Next
@@ -9978,12 +9979,15 @@
End Sub
Private Sub EventViewerMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles EventViewerMenuItem.Click
- Using dlg As New EventViewerDialog
- dlg.Owner = Me
- dlg.EventSource = tw.StoredEvent
- dlg.ShowDialog()
- Me.TopMost = SettingDialog.AlwaysTop
- End Using
+ If evtDialog.IsDisposed Then
+ evtDialog = New EventViewerDialog
+ End If
+ evtDialog.EventSource = tw.StoredEvent
+ If Not evtDialog.Visible Then
+ evtDialog.Show()
+ Else
+ evtDialog.Activate()
+ End If
End Sub
#End Region