画像プレビューの調整中

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

diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb
index 86a4170..67256e9 100644 (file)
--- a/Tween/Tween.Designer.vb
+++ b/Tween/Tween.Designer.vb
@@ -62,6 +62,8 @@ Partial Class TweenMain
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator
         Me.SaveIconPictureToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.NameLabel = New System.Windows.Forms.Label
+        Me.DateTimeLabel = New System.Windows.Forms.Label
+        Me.SplitContainer3 = New System.Windows.Forms.SplitContainer
         Me.PostBrowser = New System.Windows.Forms.WebBrowser
         Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem
@@ -82,7 +84,8 @@ Partial Class TweenMain
         Me.IdFilterAddMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.ToolStripSeparator33 = New System.Windows.Forms.ToolStripSeparator
         Me.UseHashtagMenuItem = New System.Windows.Forms.ToolStripMenuItem
-        Me.DateTimeLabel = New System.Windows.Forms.Label
+        Me.PreviewPicture = New System.Windows.Forms.PictureBox
+        Me.PreviewScrollBar = New System.Windows.Forms.VScrollBar
         Me.StatusText = New System.Windows.Forms.TextBox
         Me.lblLen = New System.Windows.Forms.Label
         Me.PostButton = New System.Windows.Forms.Button
@@ -230,9 +233,6 @@ Partial Class TweenMain
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog
         Me.TimerRefreshIcon = New System.Windows.Forms.Timer(Me.components)
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog
-        Me.SplitContainer3 = New System.Windows.Forms.SplitContainer
-        Me.PreviewScrollBar = New System.Windows.Forms.VScrollBar
-        Me.PreviewPicture = New System.Windows.Forms.PictureBox
         Me.StatusLabel = New Tween.TweenCustomControl.ToolStripLabelHistory
         Me.ToolStripContainer1.BottomToolStripPanel.SuspendLayout()
         Me.ToolStripContainer1.ContentPanel.SuspendLayout()
@@ -250,14 +250,14 @@ Partial Class TweenMain
         Me.TableLayoutPanel1.SuspendLayout()
         CType(Me.UserPicture, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStrip3.SuspendLayout()
-        Me.ContextMenuStrip4.SuspendLayout()
-        Me.MenuStrip1.SuspendLayout()
-        Me.ContextMenuStrip2.SuspendLayout()
-        Me.ContextMenuStrip1.SuspendLayout()
         Me.SplitContainer3.Panel1.SuspendLayout()
         Me.SplitContainer3.Panel2.SuspendLayout()
         Me.SplitContainer3.SuspendLayout()
+        Me.ContextMenuStrip4.SuspendLayout()
         CType(Me.PreviewPicture, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.MenuStrip1.SuspendLayout()
+        Me.ContextMenuStrip2.SuspendLayout()
+        Me.ContextMenuStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
         'ToolStripContainer1
@@ -481,6 +481,7 @@ Partial Class TweenMain
         Me.SplitContainer2.Panel2.Controls.Add(Me.StatusText)
         Me.SplitContainer2.Panel2.Controls.Add(Me.lblLen)
         Me.SplitContainer2.Panel2.Controls.Add(Me.PostButton)
+        Me.SplitContainer2.TabStop = False
         '
         'TableLayoutPanel1
         '
@@ -529,6 +530,28 @@ Partial Class TweenMain
         Me.NameLabel.Name = "NameLabel"
         Me.NameLabel.UseMnemonic = False
         '
+        'DateTimeLabel
+        '
+        resources.ApplyResources(Me.DateTimeLabel, "DateTimeLabel")
+        Me.DateTimeLabel.Name = "DateTimeLabel"
+        '
+        'SplitContainer3
+        '
+        Me.TableLayoutPanel1.SetColumnSpan(Me.SplitContainer3, 2)
+        resources.ApplyResources(Me.SplitContainer3, "SplitContainer3")
+        Me.SplitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2
+        Me.SplitContainer3.Name = "SplitContainer3"
+        '
+        'SplitContainer3.Panel1
+        '
+        Me.SplitContainer3.Panel1.Controls.Add(Me.PostBrowser)
+        '
+        'SplitContainer3.Panel2
+        '
+        Me.SplitContainer3.Panel2.Controls.Add(Me.PreviewPicture)
+        Me.SplitContainer3.Panel2.Controls.Add(Me.PreviewScrollBar)
+        Me.SplitContainer3.TabStop = False
+        '
         'PostBrowser
         '
         Me.PostBrowser.AllowWebBrowserDrop = False
@@ -637,10 +660,18 @@ Partial Class TweenMain
         Me.UseHashtagMenuItem.Name = "UseHashtagMenuItem"
         resources.ApplyResources(Me.UseHashtagMenuItem, "UseHashtagMenuItem")
         '
-        'DateTimeLabel
+        'PreviewPicture
         '
-        resources.ApplyResources(Me.DateTimeLabel, "DateTimeLabel")
-        Me.DateTimeLabel.Name = "DateTimeLabel"
+        resources.ApplyResources(Me.PreviewPicture, "PreviewPicture")
+        Me.PreviewPicture.Name = "PreviewPicture"
+        Me.PreviewPicture.TabStop = False
+        '
+        'PreviewScrollBar
+        '
+        resources.ApplyResources(Me.PreviewScrollBar, "PreviewScrollBar")
+        Me.PreviewScrollBar.LargeChange = 1
+        Me.PreviewScrollBar.Maximum = 0
+        Me.PreviewScrollBar.Name = "PreviewScrollBar"
         '
         'StatusText
         '
@@ -1404,36 +1435,6 @@ Partial Class TweenMain
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
-        'SplitContainer3
-        '
-        Me.SplitContainer3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.TableLayoutPanel1.SetColumnSpan(Me.SplitContainer3, 2)
-        resources.ApplyResources(Me.SplitContainer3, "SplitContainer3")
-        Me.SplitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2
-        Me.SplitContainer3.Name = "SplitContainer3"
-        '
-        'SplitContainer3.Panel1
-        '
-        Me.SplitContainer3.Panel1.Controls.Add(Me.PostBrowser)
-        '
-        'SplitContainer3.Panel2
-        '
-        Me.SplitContainer3.Panel2.Controls.Add(Me.PreviewPicture)
-        Me.SplitContainer3.Panel2.Controls.Add(Me.PreviewScrollBar)
-        '
-        'PreviewScrollBar
-        '
-        resources.ApplyResources(Me.PreviewScrollBar, "PreviewScrollBar")
-        Me.PreviewScrollBar.LargeChange = 1
-        Me.PreviewScrollBar.Maximum = 0
-        Me.PreviewScrollBar.Name = "PreviewScrollBar"
-        '
-        'PreviewPicture
-        '
-        resources.ApplyResources(Me.PreviewPicture, "PreviewPicture")
-        Me.PreviewPicture.Name = "PreviewPicture"
-        Me.PreviewPicture.TabStop = False
-        '
         'StatusLabel
         '
         Me.StatusLabel.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right
@@ -1472,15 +1473,15 @@ Partial Class TweenMain
         Me.TableLayoutPanel1.PerformLayout()
         CType(Me.UserPicture, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ContextMenuStrip3.ResumeLayout(False)
+        Me.SplitContainer3.Panel1.ResumeLayout(False)
+        Me.SplitContainer3.Panel2.ResumeLayout(False)
+        Me.SplitContainer3.ResumeLayout(False)
         Me.ContextMenuStrip4.ResumeLayout(False)
+        CType(Me.PreviewPicture, System.ComponentModel.ISupportInitialize).EndInit()
         Me.MenuStrip1.ResumeLayout(False)
         Me.MenuStrip1.PerformLayout()
         Me.ContextMenuStrip2.ResumeLayout(False)
         Me.ContextMenuStrip1.ResumeLayout(False)
-        Me.SplitContainer3.Panel1.ResumeLayout(False)
-        Me.SplitContainer3.Panel2.ResumeLayout(False)
-        Me.SplitContainer3.ResumeLayout(False)
-        CType(Me.PreviewPicture, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub

diff --git a/Tween/Tween.resx b/Tween/Tween.resx
index cf84963..90a3d46 100644 (file)
--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -358,7 +358,7 @@
     <value>458, 169</value>
   </data>
   <data name="ListTab.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;ListTab.Name" xml:space="preserve">
     <value>ListTab</value>
@@ -472,7 +472,7 @@
     <value>267, 14</value>
   </data>
   <data name="NameLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>0</value>
   </data>
   <data name="NameLabel.Text" xml:space="preserve">
     <value>LblName</value>
@@ -508,7 +508,7 @@
     <value>123, 14</value>
   </data>
   <data name="DateTimeLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>1</value>
   </data>
   <data name="DateTimeLabel.Text" xml:space="preserve">
     <value>Label1</value>
@@ -652,10 +652,10 @@
     <value>0, 0</value>
   </data>
   <data name="PostBrowser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>293, 78</value>
+    <value>297, 82</value>
   </data>
   <data name="PostBrowser.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
+    <value>3</value>
   </data>
   <data name="&gt;&gt;PostBrowser.Name" xml:space="preserve">
     <value>PostBrowser</value>
@@ -691,7 +691,7 @@
     <value>0, 0</value>
   </data>
   <data name="PreviewPicture.Size" type="System.Drawing.Size, System.Drawing">
-    <value>74, 78</value>
+    <value>78, 82</value>
   </data>
   <data name="PreviewPicture.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -718,13 +718,13 @@
     <value>Off</value>
   </data>
   <data name="PreviewScrollBar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>74, 0</value>
+    <value>78, 0</value>
   </data>
   <data name="PreviewScrollBar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>17, 78</value>
+    <value>17, 82</value>
   </data>
   <data name="PreviewScrollBar.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>4</value>
   </data>
   <data name="&gt;&gt;PreviewScrollBar.Name" xml:space="preserve">
     <value>PreviewScrollBar</value>
@@ -760,7 +760,7 @@
     <value>297</value>
   </data>
   <data name="SplitContainer3.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;SplitContainer3.Name" xml:space="preserve">
     <value>SplitContainer3</value>
@@ -787,7 +787,7 @@
     <value>458, 105</value>
   </data>
   <data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>20</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;TableLayoutPanel1.Name" xml:space="preserve">
     <value>TableLayoutPanel1</value>
@@ -829,7 +829,7 @@
     <value>370, 19</value>
   </data>
   <data name="StatusText.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;StatusText.Name" xml:space="preserve">
     <value>StatusText</value>
@@ -856,7 +856,7 @@
     <value>44, 21</value>
   </data>
   <data name="lblLen.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+    <value>2</value>
   </data>
   <data name="lblLen.Text" xml:space="preserve">
     <value>999</value>
@@ -889,7 +889,7 @@
     <value>44, 21</value>
   </data>
   <data name="PostButton.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
+    <value>3</value>
   </data>
   <data name="PostButton.Text" xml:space="preserve">
     <value>Post</value>
@@ -931,7 +931,7 @@
     <value>2</value>
   </data>
   <data name="SplitContainer2.TabIndex" type="System.Int32, mscorlib">
-    <value>19</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;SplitContainer2.Name" xml:space="preserve">
     <value>SplitContainer2</value>
@@ -970,7 +970,7 @@
     <value>2</value>
   </data>
   <data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;SplitContainer1.Name" xml:space="preserve">
     <value>SplitContainer1</value>
@@ -1033,7 +1033,7 @@
     <value>462, 353</value>
   </data>
   <data name="ToolStripContainer1.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>0</value>
   </data>
   <data name="ToolStripContainer1.Text" xml:space="preserve">
     <value>ToolStripContainer1</value>
@@ -1663,7 +1663,7 @@
     <value>462, 24</value>
   </data>
   <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>0</value>
   </data>
   <data name="MenuStrip1.Text" xml:space="preserve">
     <value>MenuStrip1</value>

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 80b89ef..fc205f1 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -7718,7 +7718,7 @@ RETRY:
 
         Public statusId As Long
         Public urls As List(Of String)
-        Public pics As New List(Of Bitmap)
+        Public pics As New List(Of Image)
         Public Sub New(ByVal id As Long, ByVal urlList As List(Of String))
             statusId = id
             urls = urlList
@@ -7821,12 +7821,10 @@ RETRY:
     Private Sub bgw_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
         Dim arg As PreviewData = DirectCast(e.Argument, PreviewData)
         For Each url As String In arg.urls
-            Try
-                Dim wc As New System.Net.WebClient()
-                arg.pics.Add(New Bitmap(wc.OpenRead(url)))
-                wc.Dispose()
-            Catch ex As Exception
-            End Try
+            Dim http As New HttpVarious
+            Dim img As Image = http.GetImage(url)
+            If img Is Nothing Then Continue For
+            arg.pics.Add(img)
         Next
         If arg.pics.Count = 0 Then
             Exit Sub
@@ -7858,4 +7856,5 @@ RETRY:
         End SyncLock
     End Sub
 #End Region
+
 End Class