svnno****@sourc*****
svnno****@sourc*****
2010年 11月 1日 (月) 00:42:43 JST
Revision: 1012
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1012
Author: syo68k
Date: 2010-11-01 00:42:42 +0900 (Mon, 01 Nov 2010)
Log Message:
-----------
詳細発言領域にSourceを表示するようにした
Modified Paths:
--------------
trunk/Tween/StatusDictionary.vb
trunk/Tween/Tween.vb
trunk/Tween/Twitter.vb
-------------- next part --------------
Modified: trunk/Tween/StatusDictionary.vb
===================================================================
--- trunk/Tween/StatusDictionary.vb 2010-10-31 15:04:47 UTC (rev 1011)
+++ trunk/Tween/StatusDictionary.vb 2010-10-31 15:42:42 UTC (rev 1012)
@@ -46,6 +46,7 @@
Private _InReplyToUser As String
Private _InReplyToId As Long
Private _Source As String
+ Private _SourceHtml As String
Private _ReplyToList As New List(Of String)
Private _IsMe As Boolean
Private _IsDm As Boolean
@@ -82,6 +83,7 @@
ByVal InReplyToUser As String, _
ByVal InReplyToId As Long, _
ByVal Source As String, _
+ ByVal SourceHtml As String, _
ByVal ReplyToList As List(Of String), _
ByVal IsMe As Boolean, _
ByVal IsDm As Boolean, _
@@ -106,6 +108,7 @@
_InReplyToUser = InReplyToUser
_InReplyToId = InReplyToId
_Source = Source
+ _SourceHtml = SourceHtml
_ReplyToList = ReplyToList
_IsMe = IsMe
_IsDm = IsDm
@@ -276,6 +279,14 @@
_Source = value
End Set
End Property
+ Public Property SourceHtml() As String
+ Get
+ Return _SourceHtml
+ End Get
+ Set(ByVal value As String)
+ _SourceHtml = value
+ End Set
+ End Property
Public Property ReplyToList() As List(Of String)
Get
Return _ReplyToList
@@ -942,6 +953,7 @@
item.InReplyToUser, _
item.InReplyToId, _
item.Source, _
+ item.SourceHtml, _
item.ReplyToList, _
item.IsMe, _
item.IsDm, _
Modified: trunk/Tween/Tween.vb
===================================================================
--- trunk/Tween/Tween.vb 2010-10-31 15:04:47 UTC (rev 1011)
+++ trunk/Tween/Tween.vb 2010-10-31 15:42:42 UTC (rev 1012)
@@ -4449,7 +4449,8 @@
If _curList.SelectedIndices.Count = 0 OrElse _curPost Is Nothing Then Exit Sub
- Dim dTxt As String = createDetailHtml(_curPost.OriginalData)
+ Dim dTxt As String = createDetailHtml(_curPost.OriginalData + " via " + _curPost.SourceHtml)
+
If _statuses.Tabs(_curTab.Text).TabType = TabUsageType.DirectMessage AndAlso Not _curPost.IsOwl Then
NameLabel.Text = "DM TO -> "
ElseIf _statuses.Tabs(_curTab.Text).TabType = TabUsageType.DirectMessage Then
Modified: trunk/Tween/Twitter.vb
===================================================================
--- trunk/Tween/Twitter.vb 2010-10-31 15:04:47 UTC (rev 1011)
+++ trunk/Tween/Twitter.vb 2010-10-31 15:42:42 UTC (rev 1012)
@@ -615,10 +615,13 @@
If Not post.Source.Contains("</a>") Then
post.Source += "</a>"
End If
+ post.SourceHtml = String.Copy(post.Source)
Dim mS As Match = Regex.Match(post.Source, ">(?<source>.+)<")
If mS.Success Then
post.Source = HttpUtility.HtmlDecode(mS.Result("${source}"))
End If
+ Else
+ post.SourceHtml = String.Copy(post.Source)
End If
post.IsRead = read
@@ -1540,10 +1543,13 @@
If Not post.Source.Contains("</a>") Then
post.Source += "</a>"
End If
+ post.SourceHtml = String.Copy(post.Source)
Dim mS As Match = Regex.Match(post.Source, ">(?<source>.+)<")
If mS.Success Then
post.Source = HttpUtility.HtmlDecode(mS.Result("${source}"))
End If
+ Else
+ post.SourceHtml = String.Copy(post.Source)
End If
post.IsRead = read
@@ -1687,10 +1693,13 @@
If Not post.Source.Contains("</a>") Then
post.Source += "</a>"
End If
+ post.SourceHtml = String.Copy(post.Source)
Dim mS As Match = Regex.Match(post.Source, ">(?<source>.+)<")
If mS.Success Then
post.Source = HttpUtility.HtmlDecode(mS.Result("${source}"))
End If
+ Else
+ post.SourceHtml = String.Copy(post.Source)
End If
post.IsRead = read
@@ -1981,10 +1990,13 @@
If Not post.Source.Contains("</a>") Then
post.Source += "</a>"
End If
+ post.SourceHtml = String.Copy(post.Source)
Dim mS As Match = Regex.Match(post.Source, ">(?<source>.+)<")
If mS.Success Then
post.Source = HttpUtility.HtmlDecode(mS.Result("${source}"))
End If
+ Else
+ post.SourceHtml = String.Copy(post.Source)
End If
post.IsRead = read