From 01c634c34d0be82b8bda7058f9856cedbe87902d Mon Sep 17 00:00:00 2001 From: kiri_feather Date: Wed, 15 Dec 2010 09:29:39 +0000 Subject: [PATCH] =?utf8?q?VirtualListSize=E3=81=AE=E3=83=90=E3=82=B0?= =?utf8?q?=E3=81=AF=E5=AF=BE=E5=BF=9C=E3=81=95=E3=82=8C=E3=81=9F=E3=82=88?= =?utf8?q?=E3=81=86=E3=81=AA=E3=81=AE=E3=81=A7=E3=80=81=E5=9B=9E=E9=81=BF?= =?utf8?q?=E3=82=B3=E3=83=BC=E3=83=89=E5=89=8A=E9=99=A4=20=E3=82=AB?= =?utf8?q?=E3=83=A9=E3=83=A0=E5=B9=85=E8=BF=BD=E5=BE=93=E3=81=A72=E3=82=AB?= =?utf8?q?=E3=83=A9=E3=83=A0=E3=81=AE=E6=99=82=E3=81=ABOutOfRange=E3=81=AB?= =?utf8?q?=E3=81=AA=E3=82=8B=E3=81=AE=E3=81=A7=E5=AF=BE=E5=BF=9C=20?= =?utf8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AE=E3=82=A2=E3=82=A4=E3=82=B3?= =?utf8?q?=E3=83=B3=E7=94=BB=E5=83=8F=E3=81=8C=E3=80=81=E6=9C=80=E5=B7=A6?= =?utf8?q?=E7=AB=AF=E3=81=AB=E4=BD=8D=E7=BD=AE=E3=81=99=E3=82=8B=E3=82=AB?= =?utf8?q?=E3=83=A9=E3=83=A0=E3=81=8C=E8=A1=A8=E7=A4=BA=E9=A0=98=E5=9F=9F?= =?utf8?q?=E3=81=AB=E5=85=A5=E3=82=89=E3=81=AA=E3=81=84=E3=81=A8=E6=8F=8F?= =?utf8?q?=E7=94=BB=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?utf8?q?=E3=81=AB=E6=9A=AB=E5=AE=9A=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@1211 e39ad16e-3079-482e-bb30-4b4d378143b6 --- Tween/DetailsListView.vb | 59 ++++++++------- Tween/Tween.Designer.vb | 24 +++---- Tween/Tween.en.resx | 184 +++++++++++++++++++++++++++++++++++++++-------- Tween/Tween.resx | 64 ++++++++--------- Tween/Tween.vb | 9 ++- 5 files changed, 237 insertions(+), 103 deletions(-) diff --git a/Tween/DetailsListView.vb b/Tween/DetailsListView.vb index 8bc3c1b5..c167a13e 100644 --- a/Tween/DetailsListView.vb +++ b/Tween/DetailsListView.vb @@ -46,33 +46,38 @@ Namespace TweenCustomControl DoubleBuffered = True End Sub - _ - Public Shadows Property VirtualListSize() As Integer - Get - Return MyBase.VirtualListSize - End Get - Set(ByVal value As Integer) - If value = MyBase.VirtualListSize Then Exit Property - If MyBase.VirtualListSize > 0 And value > 0 Then - Dim topIndex As Integer = 0 - If Not Me.IsDisposed Then - If MyBase.VirtualListSize < value Then - If Me.TopItem Is Nothing Then - topIndex = 0 - Else - topIndex = Me.TopItem.Index - End If - topIndex = Math.Min(topIndex, Math.Abs(value - 1)) - Me.TopItem = Me.Items(topIndex) - Else - Me.TopItem = Me.Items(0) - End If - End If - End If - MyBase.VirtualListSize = value - End Set - End Property + ' _ + 'Public Shadows Property VirtualListSize() As Integer + ' Get + ' Return MyBase.VirtualListSize + ' End Get + ' Set(ByVal value As Integer) + ' If value = MyBase.VirtualListSize Then Exit Property + ' If MyBase.VirtualListSize > 0 And value > 0 Then + ' Dim topIndex As Integer = 0 + ' If Not Me.IsDisposed Then + ' If MyBase.VirtualListSize < value Then + ' If Me.TopItem Is Nothing Then + ' topIndex = 0 + ' Else + ' topIndex = Me.TopItem.Index + ' End If + ' topIndex = Math.Min(topIndex, Math.Abs(value - 1)) + ' Me.TopItem = Me.Items(topIndex) + ' Else + ' If Me.TopItem Is Nothing Then + ' topIndex = 0 + ' Else + + ' End If + ' Me.TopItem = Me.Items(0) + ' End If + ' End If + ' End If + ' MyBase.VirtualListSize = value + ' End Set + 'End Property Public Sub ChangeItemBackColor(ByVal index As Integer, ByVal backColor As Color) ChangeSubItemBackColor(index, 0, backColor) diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb index ab9ec927..41c0c742 100644 --- a/Tween/Tween.Designer.vb +++ b/Tween/Tween.Designer.vb @@ -224,6 +224,8 @@ Partial Class TweenMain Me.ToolStripSeparator40 = New System.Windows.Forms.ToolStripSeparator() Me.TrackToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AllrepliesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator42 = New System.Windows.Forms.ToolStripSeparator() + Me.EventViewerMenuItem = 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() @@ -289,8 +291,6 @@ 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.ToolStripSeparator42 = New System.Windows.Forms.ToolStripSeparator() - Me.EventViewerMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripContainer1.BottomToolStripPanel.SuspendLayout() Me.ToolStripContainer1.ContentPanel.SuspendLayout() Me.ToolStripContainer1.TopToolStripPanel.SuspendLayout() @@ -1481,6 +1481,16 @@ Partial Class TweenMain Me.AllrepliesToolStripMenuItem.Name = "AllrepliesToolStripMenuItem" resources.ApplyResources(Me.AllrepliesToolStripMenuItem, "AllrepliesToolStripMenuItem") ' + 'ToolStripSeparator42 + ' + Me.ToolStripSeparator42.Name = "ToolStripSeparator42" + resources.ApplyResources(Me.ToolStripSeparator42, "ToolStripSeparator42") + ' + 'EventViewerMenuItem + ' + Me.EventViewerMenuItem.Name = "EventViewerMenuItem" + resources.ApplyResources(Me.EventViewerMenuItem, "EventViewerMenuItem") + ' '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}) @@ -1811,16 +1821,6 @@ Partial Class TweenMain ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" ' - 'ToolStripSeparator42 - ' - Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - resources.ApplyResources(Me.ToolStripSeparator42, "ToolStripSeparator42") - ' - 'EventViewerMenuItem - ' - Me.EventViewerMenuItem.Name = "EventViewerMenuItem" - resources.ApplyResources(Me.EventViewerMenuItem, "EventViewerMenuItem") - ' 'TweenMain ' Me.AllowDrop = True diff --git a/Tween/Tween.en.resx b/Tween/Tween.en.resx index 8d8a8911..7ebee9f6 100644 --- a/Tween/Tween.en.resx +++ b/Tween/Tween.en.resx @@ -181,6 +181,9 @@ 371, 214 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -196,6 +199,12 @@ AM6Zu81Ok84loYCjYrfpzJoZm84Uh90qVIDz/NGH0AEgNQb7UmkAAAAASUVORK5CYII= + + + + + + 208, 22 @@ -256,29 +265,71 @@ 209, 212 + + + - 570, 240 + 570, 242 + + + - 570, 240 + 570, 242 + + + - 570, 212 + 570, 214 + + + + + + + + + Service + + + + + + + + + FilePath + + + - 0, 212 + 0, 214 + + + - 570, 240 + 570, 242 + + + - 570, 240 + 570, 242 + + + + + + 242, 22 @@ -340,6 +391,15 @@ 243, 214 + + + + + + + + + 185, 22 @@ -460,30 +520,96 @@ 264, 342 + + + - 508, 48 + 508, 46 + + + + + + + + + - 570, 71 + 570, 69 + + + + + + + + + + + + + + + + + + - 570, 98 + 570, 96 - 71 + 69 + + + + + + - 194, 100 + 194, 98 + + + - 17, 100 + 17, 98 + + + + + + - 570, 98 + 570, 96 + + + + + + - 244 + 246 + + + + + + + + + + + + + + + 211, 22 @@ -908,21 +1034,6 @@ &Command - - 152, 22 - - - 152, 22 - - - 149, 6 - - - 152, 22 - - - 152, 22 - Open Tween &Help Site @@ -944,6 +1055,12 @@ &Help + + + + + + 243, 22 @@ -1139,6 +1256,9 @@ 244, 490 + + + 208, 22 @@ -1187,4 +1307,10 @@ 209, 154 + + + + + + \ No newline at end of file diff --git a/Tween/Tween.resx b/Tween/Tween.resx index b0e26c15..14cef1bc 100644 --- a/Tween/Tween.resx +++ b/Tween/Tween.resx @@ -382,7 +382,7 @@ 0, 0, 0, 0 - 570, 244 + 570, 248 0 @@ -406,7 +406,7 @@ 0, 0 - 570, 244 + 570, 248 0 @@ -436,7 +436,7 @@ 0, 0 - 570, 216 + 570, 220 Zoom @@ -640,7 +640,7 @@ Bottom - 0, 216 + 0, 220 3, 3, 3, 3 @@ -670,7 +670,7 @@ 0, 0 - 570, 244 + 570, 248 1 @@ -697,7 +697,7 @@ 0, 0 - 570, 244 + 570, 248 2 @@ -1039,7 +1039,7 @@ 59, 20 - 508, 44 + 508, 40 6 @@ -1144,7 +1144,7 @@ 2 - 570, 67 + 570, 63 1 @@ -1282,10 +1282,10 @@ 19 - 570, 94 + 570, 90 - 67 + 63 2 @@ -1327,7 +1327,7 @@ 0, 0 - 194, 96 + 194, 92 Zoom @@ -1357,7 +1357,7 @@ 194, 0 - 17, 96 + 17, 92 0 @@ -1387,7 +1387,7 @@ 1 - 570, 94 + 570, 90 355 @@ -1426,7 +1426,7 @@ 574, 348 - 248 + 252 2 @@ -2140,31 +2140,31 @@ その他機能(&C) - 152, 22 + 147, 22 Stop - 149, 6 + 144, 6 - 152, 22 + 147, 22 Track - 152, 22 + 147, 22 All @replies - 149, 6 + 144, 6 - 152, 22 + 147, 22 View Events @@ -3612,6 +3612,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator42 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + EventViewerMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MenuItemHelp @@ -3990,18 +4002,6 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripSeparator42 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - EventViewerMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TweenMain diff --git a/Tween/Tween.vb b/Tween/Tween.vb index 7205a7fb..aeffdc14 100644 --- a/Tween/Tween.vb +++ b/Tween/Tween.vb @@ -2559,11 +2559,13 @@ Public Class TweenMain Me.Visible AndAlso _ Me.WindowState = FormWindowState.Normal Then + Dim colNo As Integer = 2 + If _iconCol Then colNo = 1 Dim widthDiff As Integer = Me.ClientSize.Width - Me._mySize.Width Dim listView As DetailsListView = CType(Me._curTab.Tag, DetailsListView) - Dim column As ColumnHeader = listView.Columns(2) + Dim column As ColumnHeader = listView.Columns(colNo) column.Width += widthDiff - Me.MyList_ColumnWidthChanged(listView, New ColumnWidthChangedEventArgs(2)) + Me.MyList_ColumnWidthChanged(listView, New ColumnWidthChangedEventArgs(colNo)) _mySize = Me.ClientSize _mySpDis = Me.SplitContainer1.SplitterDistance @@ -3945,8 +3947,9 @@ Public Class TweenMain Private Sub MyList_DrawSubItem(ByVal sender As Object, ByVal e As DrawListViewSubItemEventArgs) If e.ItemState = 0 Then Exit Sub + Me.DrawListViewItemIcon(e) If e.ColumnIndex = 0 Then - Me.DrawListViewItemIcon(e) + 'Me.DrawListViewItemIcon(e) Else 'アイコン以外の列 Dim rct As RectangleF = e.Bounds -- 2.11.0