返信先を開く際、検索タブ、リストタブを考慮していなかったバグ修正

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

diff --git a/Tween/MyCommon.vb b/Tween/MyCommon.vb
index 9170b1a..c51dd28 100644 (file)
--- a/Tween/MyCommon.vb
+++ b/Tween/MyCommon.vb
@@ -522,6 +522,7 @@ retry:
         Return name
     End Function
 
+    <FlagsAttribute()> _
     Public Enum TabUsageType
         Undefined
         Home            'Unique

diff --git a/Tween/StatusDictionary.vb b/Tween/StatusDictionary.vb
index 05d75ba..1fb53b3 100644 (file)
--- a/Tween/StatusDictionary.vb
+++ b/Tween/StatusDictionary.vb
@@ -1304,7 +1304,7 @@ Public NotInheritable Class TabInformations
         SyncLock LockObj
             Dim tbs As New List(Of TabClass)
             For Each tb As TabClass In _tabs.Values
-                If tb.TabType = tabType Then tbs.Add(tb)
+                If (tabType And tb.TabType) = tb.TabType Then tbs.Add(tb)
             Next
             Return tbs
         End SyncLock

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index c73b564..5de0edb 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -6517,10 +6517,20 @@ RETRY:
 
     Private Sub doRepliedStatusOpen()
         If _curPost IsNot Nothing AndAlso _curPost.InReplyToUser IsNot Nothing AndAlso _curPost.InReplyToId > 0 Then
-            If _statuses.ContainsKey(_curPost.InReplyToId) AndAlso Not My.Computer.Keyboard.ShiftKeyDown Then
+            If My.Computer.Keyboard.ShiftKeyDown Then
+                OpenUriAsync("http://twitter.com/" + _curPost.InReplyToUser + "/status/" + _curPost.InReplyToId.ToString())
+                Exit Sub
+            End If
+            If _statuses.ContainsKey(_curPost.InReplyToId) Then
                 Dim repPost As PostClass = _statuses.Item(_curPost.InReplyToId)
                 MessageBox.Show(repPost.Name + " / " + repPost.Nickname + "   (" + repPost.PDate.ToString() + ")" + Environment.NewLine + repPost.Data)
             Else
+                For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.Lists Or TabUsageType.PublicSearch)
+                    If tb Is Nothing OrElse Not tb.Contains(_curPost.InReplyToId) Then Exit For
+                    Dim repPost As PostClass = _statuses.Item(_curPost.InReplyToId)
+                    MessageBox.Show(repPost.Name + " / " + repPost.Nickname + "   (" + repPost.PDate.ToString() + ")" + Environment.NewLine + repPost.Data)
+                    Exit Sub
+                Next
                 OpenUriAsync("http://twitter.com/" + _curPost.InReplyToUser + "/status/" + _curPost.InReplyToId.ToString())
             End If
         End If

diff --git a/Tween/Tween.vbproj b/Tween/Tween.vbproj
index 780000b..324f68f 100644 (file)
--- a/Tween/Tween.vbproj
+++ b/Tween/Tween.vbproj
@@ -18,6 +18,9 @@
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <OptionStrict>On</OptionStrict>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -30,11 +33,8 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <OptionStrict>On</OptionStrict>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -423,7 +423,7 @@
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
       <Install>false</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
@@ -448,7 +448,7 @@
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
       <Visible>False</Visible>
-      <ProductName>Windows インストーラ 3.1</ProductName>
+      <ProductName>Windows インストーラー 3.1</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>