プレビュー取得の調整

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

diff --git a/Tween/Tween.resx b/Tween/Tween.resx
index 2f06d5f..c9a4a25 100644 (file)
--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -223,7 +223,7 @@
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>0</value>
   </data>
   <data name="StatusStrip1.Text" xml:space="preserve">
     <value>StatusStrip1</value>
@@ -655,7 +655,7 @@
     <value>299, 78</value>
   </data>
   <data name="PostBrowser.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;PostBrowser.Name" xml:space="preserve">
     <value>PostBrowser</value>
@@ -724,7 +724,7 @@
     <value>17, 78</value>
   </data>
   <data name="PreviewScrollBar.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;PreviewScrollBar.Name" xml:space="preserve">
     <value>PreviewScrollBar</value>
@@ -787,7 +787,7 @@
     <value>465, 105</value>
   </data>
   <data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;TableLayoutPanel1.Name" xml:space="preserve">
     <value>TableLayoutPanel1</value>
@@ -850,7 +850,7 @@
     <value>377, 19</value>
   </data>
   <data name="StatusText.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;StatusText.Name" xml:space="preserve">
     <value>StatusText</value>
@@ -877,7 +877,7 @@
     <value>44, 21</value>
   </data>
   <data name="lblLen.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>1</value>
   </data>
   <data name="lblLen.Text" xml:space="preserve">
     <value>999</value>
@@ -910,7 +910,7 @@
     <value>44, 21</value>
   </data>
   <data name="PostButton.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>2</value>
   </data>
   <data name="PostButton.Text" xml:space="preserve">
     <value>Post</value>
@@ -991,7 +991,7 @@
     <value>2</value>
   </data>
   <data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;SplitContainer1.Name" xml:space="preserve">
     <value>SplitContainer1</value>

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 6eaeaa2..f6a306c 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -7729,7 +7729,6 @@ RETRY:
     End Property
 
 #Region "イメージプレビュー"
-    Private bgw As BackgroundWorker
     Private lckPrev As New Object
     Private _prev As PreviewData
     Private Class PreviewData
@@ -7777,12 +7776,12 @@ RETRY:
             PreviewPicture.Image = Nothing
             Me.SplitContainer3.Panel2Collapsed = True
         End If
-        SyncLock lckPrev
-            If _prev IsNot Nothing Then
-                _prev.Dispose()
-                _prev = Nothing
-            End If
-        End SyncLock
+        'SyncLock lckPrev
+        '    If _prev IsNot Nothing Then
+        '        _prev.Dispose()
+        '        _prev = Nothing
+        '    End If
+        'End SyncLock
 
         If links.Count = 0 Then
             Me.PreviewScrollBar.Maximum = 0
@@ -7919,6 +7918,7 @@ RETRY:
 
         're = New Regex("http://.*\.jpg.*|http://.*(\.jpg|\.jpeg|\.gif|\.png|\.bmp)|http://twitpic\.com/show/thumb/.*|http://TweetPhotoAPI\.com/api/TPAPI\.svc/imagefromurl.*", RegexOptions.IgnoreCase)
         'If re.IsMatch(imglist(0)) = True Then
+        Dim bgw As BackgroundWorker
         bgw = New BackgroundWorker()
         AddHandler bgw.DoWork, AddressOf bgw_DoWork
         AddHandler bgw.RunWorkerCompleted, AddressOf bgw_Completed
@@ -7936,16 +7936,23 @@ RETRY:
             arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, img))
         Next
         If arg.pics.Count = 0 Then
-            Exit Sub
+            e.Result = Nothing
+        Else
+            e.Result = arg
         End If
-        SyncLock lckPrev
-            _prev = arg
-        End SyncLock
     End Sub
 
     Private Sub bgw_Completed(ByVal sender As System.Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs)
+        If e.Result Is Nothing Then
+            Me.PreviewScrollBar.Maximum = 0
+            Me.PreviewScrollBar.Enabled = False
+            Me.SplitContainer3.Panel2Collapsed = True
+            Exit Sub
+        End If
+        Dim prv As PreviewData = DirectCast(e.Result, PreviewData)
         SyncLock lckPrev
-            If _prev IsNot Nothing AndAlso _curPost IsNot Nothing AndAlso _prev.statusId = _curPost.Id Then
+            If prv IsNot Nothing AndAlso _curPost IsNot Nothing AndAlso prv.statusId = _curPost.Id Then
+                _prev = prv
                 Me.SplitContainer3.Panel2Collapsed = False
                 Me.PreviewScrollBar.Maximum = _prev.pics.Count - 1
                 If Me.PreviewScrollBar.Maximum > 0 Then
@@ -7996,4 +8003,5 @@ RETRY:
             modifySettingLocal = True
         End If
     End Sub
+
 End Class

diff --git a/Tween/Tween.vbproj.user b/Tween/Tween.vbproj.user
index 5f6826b..65f5e9c 100644 (file)
--- a/Tween/Tween.vbproj.user
+++ b/Tween/Tween.vbproj.user
@@ -11,7 +11,7 @@
     </BootstrapperUrlHistory>
     <FallbackCulture>ja-JP</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
     <ErrorReportUrlHistory>
     </ErrorReportUrlHistory>
     <ApplicationRevision>0</ApplicationRevision>