リスト部分のキーダウンイベントフックをタブコントロールに戻し

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

diff --git a/Tween/MySocket.vb b/Tween/MySocket.vb
index e6f392b..39bc47b 100644 (file)
--- a/Tween/MySocket.vb
+++ b/Tween/MySocket.vb
@@ -108,12 +108,7 @@ Public NotInheritable Class MySocket
             webReq.KeepAlive = True
             webReq.AllowAutoRedirect = False
             webReq.UserAgent = userAgent
-            'If reqType = REQ_TYPE.ReqGetNoCache Then
-            '    webReq.CachePolicy = cpolicy
-            'End If
-            If _proxyType <> ProxyType.IE Then
-                webReq.Proxy = _proxy
-            End If
+            If _proxyType <> ProxyType.IE Then webReq.Proxy = _proxy
 
             If referer <> "" Then webReq.Referer = referer
             'POST系
@@ -122,14 +117,6 @@ Public NotInheritable Class MySocket
                reqType = REQ_TYPE.ReqPOSTAPI Then
                 webReq.Method = "POST"
 
-                If DefaultTimeOut = timeOut Then
-                    webReq.Timeout = DefaultTimeOut
-                Else
-                    webReq.Timeout = timeOut
-                End If
-
-                Dim dataB As Byte() = Encoding.ASCII.GetBytes(data)
-                webReq.ContentLength = dataB.Length
                 Select Case reqType
                     Case REQ_TYPE.ReqPOST
                         webReq.ContentType = "application/x-www-form-urlencoded"
@@ -141,9 +128,10 @@ Public NotInheritable Class MySocket
                         webReq.Accept = "text/html, */*"
                         webReq.Headers.Add(HttpRequestHeader.Authorization, _cre)
                 End Select
-                Dim st As Stream = webReq.GetRequestStream()
-                st.Write(dataB, 0, dataB.Length)
-                st.Close()
+                'データ設定
+                Using writer As New StreamWriter(webReq.GetRequestStream)
+                    writer.Write(data)
+                End Using
             ElseIf reqType = REQ_TYPE.ReqGET Then
                 webReq.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
                 webReq.Headers.Add("Accept-Language", "ja,en-us;q=0.7,en;q=0.3")

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index d0228e0..7971680 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -3097,7 +3097,7 @@ Public Class TweenMain
         AddHandler _listCustom.CacheVirtualItems, AddressOf MyList_CacheVirtualItems
         AddHandler _listCustom.RetrieveVirtualItem, AddressOf MyList_RetrieveVirtualItem
         AddHandler _listCustom.DrawSubItem, AddressOf MyList_DrawSubItem
-        AddHandler _listCustom.KeyDown, AddressOf MyList_KeyDown
+        'AddHandler _listCustom.KeyDown, AddressOf MyList_KeyDown
 
         _colHd1.Text = ""
         _colHd1.Width = 48
@@ -3270,7 +3270,7 @@ Public Class TweenMain
         RemoveHandler _listCustom.CacheVirtualItems, AddressOf MyList_CacheVirtualItems
         RemoveHandler _listCustom.RetrieveVirtualItem, AddressOf MyList_RetrieveVirtualItem
         RemoveHandler _listCustom.DrawSubItem, AddressOf MyList_DrawSubItem
-        RemoveHandler _listCustom.KeyDown, AddressOf MyList_KeyDown
+        'RemoveHandler _listCustom.KeyDown, AddressOf MyList_KeyDown
 
         TabDialog.RemoveTab(TabName)
 
@@ -4107,7 +4107,15 @@ RETRY:
         OpenUriAsync("http://sourceforge.jp/projects/tween/wiki/FrontPage")
     End Sub
 
-    Private Sub MyList_KeyDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.KeyEventArgs)
+    Private Sub ListTab_KeyDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles ListTab.KeyDown
+        If ListTab.SelectedTab IsNot Nothing Then
+            If _statuses.Tabs(ListTab.SelectedTab.Text).TabType = TabUsageType.PublicSearch Then
+                Dim pnl As Control = ListTab.SelectedTab.Controls("panelSearch")
+                If pnl.Controls("comboSearch").Focused OrElse _
+                   pnl.Controls("comboLang").Focused OrElse _
+                   pnl.Controls("buttonSearch").Focused Then Exit Sub
+            End If
+        End If
         If e.Modifiers = Keys.None Then
             ' ModifierKeyが押されていない場合
             If e.KeyCode = Keys.N OrElse e.KeyCode = Keys.Right Then
@@ -4266,7 +4274,7 @@ RETRY:
             If e.KeyCode = Keys.R Then
                 e.Handled = True
                 e.SuppressKeyPress = True
-                dorefreshmore()
+                DoRefreshMore()
             End If
         End If
         If Not e.Alt Then