Changeset 23500

Timestamp:

11/13/08 08:45:51 (5 years ago)

Author:

syo68k

Message:

URL変換のUndo実装、選択範囲のURL短縮変換を再実装、範囲選択時の変換はURLエンコードするように（日本語を含むURL対策）、選択していない場合はすべてのURLを短縮変換、メニューの「自動判定」を「圧縮サービス自動選択」に変更

Location:

lang/vb2005/Tween/Tween

Files:

• Resources/ChangeLog.txt (modified) (1 diff)
• Tween.Designer.vb (modified) (7 diffs)
• Tween.vb (modified) (2 diffs)
• Twitter.vb (modified) (6 diffs)

lang/vb2005/Tween/Tween/Resources/ChangeLog.txt

@@ -6 +6 @@
 -発言詳細が隠せなくなっていた問題を修正
 -起動時のアップデート処理でエラーが発生する問題を再修正
--コマンドメニューのURL短縮変換サブメニューに「自動判定」を追加。Tinyurlから応答がないときはis.gdを試します。
--CTRL+LをURL短縮変換の「自動判定」に割り当て。
+-コマンドメニューのURL短縮変換サブメニューに「短縮サービス自動選択」を追加。Tinyurlから応答がないときはis.gdを試します。
+-CTRL+LをURL短縮変換の「短縮サービス自動選択」に割り当て。
+-入力欄で範囲選択をしている場合は、その選択範囲をURLとみなして変換するようにした。（日本語がURLに含まれる場合はこちらをどうぞ。httpで始まっているかどうか、以外のURL妥当性検証は意図的に行っていません）
+-コマンドメニューのURL短縮変換サブメニューに「元に戻す」を追加。POST動作をするまでの間の変換を元に戻せます。
 ***Ver0.1.0.1(2008/11/11)
 -「操作」メニューに「返信先ステータスを開く」を追加。ショートカットキーはCTRL+Iです。

lang/vb2005/Tween/Tween/Tween.Designer.vb

@@ -121 +121 @@
         Me.MenuItemCommand = New System.Windows.Forms.ToolStripMenuItem
         Me.TinyUrlConvertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.UrlConvertAutoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.UrlUndoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.TinyURLToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.IsgdToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
@@ -136 +138 @@
         Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator
         Me.AboutMenuItem = New System.Windows.Forms.ToolStripMenuItem
-        Me.UrlConvertAutoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.ContextMenuStrip3.SuspendLayout()
         Me.ContextMenuTabProperty.SuspendLayout()
@@ -469 +470 @@
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SettingStripMenuItem, Me.ToolStripSeparator9, Me.SaveLogMenuItem, Me.ToolStripSeparator17, Me.NewPostPopMenuItem, Me.PlaySoundMenuItem, Me.ListLockMenuItem, Me.ToolStripSeparator15, Me.MultiLineMenuItem, Me.ToolStripSeparator21, Me.EndToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.OwnerItem = Me.MenuItemFile
         Me.ContextMenuStrip1.ShowCheckMargin = True
         Me.ContextMenuStrip1.ShowImageMargin = False
@@ -852 +854 @@
         'TinyUrlConvertToolStripMenuItem
         '
-        Me.TinyUrlConvertToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UrlConvertAutoToolStripMenuItem, Me.TinyURLToolStripMenuItem, Me.IsgdToolStripMenuItem})
+        Me.TinyUrlConvertToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UrlConvertAutoToolStripMenuItem, Me.UrlUndoToolStripMenuItem, Me.TinyURLToolStripMenuItem, Me.IsgdToolStripMenuItem})
         Me.TinyUrlConvertToolStripMenuItem.Name = "TinyUrlConvertToolStripMenuItem"
         Me.TinyUrlConvertToolStripMenuItem.Size = New System.Drawing.Size(220, 22)
         Me.TinyUrlConvertToolStripMenuItem.Text = "入力欄のURLを短縮変換"
         '
+        'UrlConvertAutoToolStripMenuItem
+        '
+        Me.UrlConvertAutoToolStripMenuItem.Name = "UrlConvertAutoToolStripMenuItem"
+        Me.UrlConvertAutoToolStripMenuItem.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.L), System.Windows.Forms.Keys)
+        Me.UrlConvertAutoToolStripMenuItem.Size = New System.Drawing.Size(242, 22)
+        Me.UrlConvertAutoToolStripMenuItem.Text = "短縮サービス自動選択"
+        '
+        'UrlUndoToolStripMenuItem
+        '
+        Me.UrlUndoToolStripMenuItem.Enabled = False
+        Me.UrlUndoToolStripMenuItem.Name = "UrlUndoToolStripMenuItem"
+        Me.UrlUndoToolStripMenuItem.Size = New System.Drawing.Size(218, 22)
+        Me.UrlUndoToolStripMenuItem.Text = "元に戻す"
+        '
         'TinyURLToolStripMenuItem
         '
         Me.TinyURLToolStripMenuItem.Name = "TinyURLToolStripMenuItem"
-        Me.TinyURLToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
+        Me.TinyURLToolStripMenuItem.Size = New System.Drawing.Size(218, 22)
         Me.TinyURLToolStripMenuItem.Text = "TinyURL"
         '
@@ -866 +882 @@
         '
         Me.IsgdToolStripMenuItem.Name = "IsgdToolStripMenuItem"
-        Me.IsgdToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
+        Me.IsgdToolStripMenuItem.Size = New System.Drawing.Size(218, 22)
         Me.IsgdToolStripMenuItem.Text = "is.gd"
         '
@@ -943 +959 @@
         Me.AboutMenuItem.Size = New System.Drawing.Size(217, 22)
         Me.AboutMenuItem.Text = "Tweenについて(&A)"
-        '
-        'UrlConvertAutoToolStripMenuItem
-        '
-        Me.UrlConvertAutoToolStripMenuItem.Name = "UrlConvertAutoToolStripMenuItem"
-        Me.UrlConvertAutoToolStripMenuItem.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.L), System.Windows.Forms.Keys)
-        Me.UrlConvertAutoToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
-        Me.UrlConvertAutoToolStripMenuItem.Text = "自動判定"
         '
         'TweenMain
@@ -1101 +1110 @@
     Friend WithEvents IsgdToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents UrlConvertAutoToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents UrlUndoToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
 
 End Class

lang/vb2005/Tween/Tween/Tween.vb

@@ -6091 +6091 @@
         Dim args As New GetWorkerArg()
 
+        UrlUndoToolStripMenuItem.Enabled = False  'Undoをできないように設定 Twitter.vb側でUndoバッファはクリアしているはず
+
         TimerRefreshIcon.Enabled = False
         If My.Computer.Network.IsAvailable Then
@@ -6968 +6970 @@
         End If
     End Sub
+
+    Private Sub UrlUndoToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles UrlUndoToolStripMenuItem.Click
+        clsTw.doUrlUndo()
+    End Sub
 End Class
 

lang/vb2005/Tween/Tween/Twitter.vb

@@ -2 +2 @@
 Imports System.Xml
 Imports System.Text
+Imports System.Collections
 Imports System.Text.RegularExpressions
 
@@ -134 +135 @@
         GET_DMSNT
     End Enum
+
     Public Enum UrlConverter
         TinyUrl
         Isgd
     End Enum
+
+    Private Class urlUndo
+        Public Before As String
+        Public After As String
+    End Class
+
+    Private urlUndoBuffer As Generic.List(Of urlUndo) = Nothing
 
 
@@ -1231 +1240 @@
 
         If resStatus.StartsWith("OK") Then
+            urlUndoBuffer = Nothing
             Return ""
         Else
@@ -1762 +1772 @@
         Dim result As String = ""
         Dim url As Regex = New Regex("https?://[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]+")
+
         Dim urls As RegularExpressions.MatchCollection = Nothing
         Dim src As String = ""
@@ -1767 +1778 @@
         urls = url.Matches(TweenMain.StatusText.Text)
 
-        ' 正規表現にマッチしたURL文字列をtinyurl化
-        For Each tmp2 As Match In urls
-            Dim tmp As String = tmp2.ToString
-
-            ' ExcludeStringで指定された文字列で始まる場合は対象としない
-            If tmp.StartsWith(ExcludeString) Then
+        If TweenMain.StatusText.SelectionLength > 0 Then
+            Dim tmp As String = TweenMain.StatusText.SelectedText
+            ' httpから始まらない場合、ExcludeStringで指定された文字列で始まる場合は対象としない
+            If Not tmp.StartsWith("http") OrElse tmp.StartsWith(ExcludeString) Then
                 ' Nothing
             Else
-                '選んだURLを選択（？）
-                TweenMain.StatusText.Select(TweenMain.StatusText.Text.IndexOf(tmp), tmp.Length)
-
-                'tinyurl変換
-                result = MakeShortUrl(Converter_Type, TweenMain.StatusText.SelectedText)
+                ' 文字列が選択されている場合はその文字列について処理
+
+                '短縮URL変換 日本語を含むかもしれないのでURLエンコードする
+                result = MakeShortUrl(Converter_Type, HttpUtility.UrlEncode(TweenMain.StatusText.SelectedText))
 
                 If result.Equals("Can't convert") Then
@@ -1786 +1794 @@
 
                 If Not result = "" Then
+                    Dim undotmp As New urlUndo
+
                     TweenMain.StatusText.Select(TweenMain.StatusText.Text.IndexOf(tmp), tmp.Length)
                     TweenMain.StatusText.SelectedText = result
+
+                    'undoバッファにセット
+                    undotmp.Before = tmp
+                    undotmp.After = result
+
+                    If urlUndoBuffer Is Nothing Then
+                        urlUndoBuffer = New List(Of urlUndo)
+                        TweenMain.UrlUndoToolStripMenuItem.Enabled = True
+                    End If
+
+                    urlUndoBuffer.Add(undotmp)
                 End If
-
             End If
-        Next
-
-        Return True
+        Else
+            ' 正規表現にマッチしたURL文字列をtinyurl化
+            For Each tmp2 As Match In urls
+                Dim tmp As String = tmp2.ToString
+                Dim undotmp As New urlUndo
+
+                ' ExcludeStringで指定された文字列で始まる場合は対象としない
+                If tmp.StartsWith(ExcludeString) Then
+                    ' Nothing
+                Else
+                    '選んだURLを選択（？）
+                    TweenMain.StatusText.Select(TweenMain.StatusText.Text.IndexOf(tmp), tmp.Length)
+
+                    '短縮URL変換
+                    result = MakeShortUrl(Converter_Type, TweenMain.StatusText.SelectedText)
+
+                    If result.Equals("Can't convert") Then
+                        Return False
+                    End If
+
+                    If Not result = "" Then
+                        TweenMain.StatusText.Select(TweenMain.StatusText.Text.IndexOf(tmp), tmp.Length)
+                        TweenMain.StatusText.SelectedText = result
+                        'undoバッファにセット
+                        undotmp.Before = tmp
+                        undotmp.After = result
+
+                        If urlUndoBuffer Is Nothing Then
+                            urlUndoBuffer = New List(Of urlUndo)
+                            TweenMain.UrlUndoToolStripMenuItem.Enabled = True
+                        End If
+
+                        urlUndoBuffer.Add(undotmp)
+                    End If
+
+                End If
+            Next
+
+
+        End If
+
+
+            Return True
 
     End Function
-
+    Public Sub doUrlUndo()
+        If urlUndoBuffer IsNot Nothing Then
+            Dim tmp As String = TweenMain.StatusText.Text
+            For Each data As urlUndo In urlUndoBuffer
+                tmp = tmp.Replace(data.After, data.Before)
+            Next
+            TweenMain.StatusText.Text = tmp
+            urlUndoBuffer = Nothing
+            TweenMain.UrlUndoToolStripMenuItem.Enabled = False
+        End If
+    End Sub
 #If DEBUG Then
     Public Sub GenerateAnalyzeKey()