From 0764c81d1ba80cd661e1841a95682e40c4678e48 Mon Sep 17 00:00:00 2001 From: syo68k Date: Wed, 6 Oct 2010 21:59:04 +0000 Subject: [PATCH] =?utf8?q?u.nu=E3=82=B5=E3=83=BC=E3=83=93=E3=82=B9?= =?utf8?q?=E7=B5=82=E4=BA=86=E3=81=AB=E4=BC=B4=E3=81=84=E9=96=A2=E9=80=A3?= =?utf8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E9=99=A4=E5=8E=BB=E3=80=80?= =?utf8?q?=E8=A8=AD=E5=AE=9A=E3=81=AB=E6=AE=8B=E3=81=A3=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AFbit.ly=E3=81=B8=E8=AA=AD?= =?utf8?q?=E3=81=BF=E6=9B=BF=E3=81=88=E3=82=92=E8=A1=8C=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@941 e39ad16e-3079-482e-bb30-4b4d378143b6 --- Tween/MyCommon.vb | 3 +- Tween/Setting.Designer.vb | 2 +- Tween/Setting.resx | 5 +- Tween/ShortUrl.vb | 15 - Tween/Tween.Designer.vb | 9 +- Tween/Tween.resx | 1992 ++++++++++++++++++++++++--------------------- Tween/Tween.vb | 14 +- 7 files changed, 1081 insertions(+), 959 deletions(-) diff --git a/Tween/MyCommon.vb b/Tween/MyCommon.vb index 5f0490de..c9f2a3b0 100644 --- a/Tween/MyCommon.vb +++ b/Tween/MyCommon.vb @@ -74,11 +74,12 @@ Public Module MyCommon TinyUrl Isgd Twurl - Unu Bitly Jmp '特殊 Nicoms + '廃止 + Unu = -1 End Enum Public Enum OutputzUrlmode diff --git a/Tween/Setting.Designer.vb b/Tween/Setting.Designer.vb index dd1fef99..1d310632 100644 --- a/Tween/Setting.Designer.vb +++ b/Tween/Setting.Designer.vb @@ -1228,7 +1228,7 @@ Partial Class Setting ' Me.ComboBoxAutoShortUrlFirst.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBoxAutoShortUrlFirst.FormattingEnabled = True - Me.ComboBoxAutoShortUrlFirst.Items.AddRange(New Object() {resources.GetString("ComboBoxAutoShortUrlFirst.Items"), resources.GetString("ComboBoxAutoShortUrlFirst.Items1"), resources.GetString("ComboBoxAutoShortUrlFirst.Items2"), resources.GetString("ComboBoxAutoShortUrlFirst.Items3"), resources.GetString("ComboBoxAutoShortUrlFirst.Items4"), resources.GetString("ComboBoxAutoShortUrlFirst.Items5")}) + Me.ComboBoxAutoShortUrlFirst.Items.AddRange(New Object() {resources.GetString("ComboBoxAutoShortUrlFirst.Items"), resources.GetString("ComboBoxAutoShortUrlFirst.Items1"), resources.GetString("ComboBoxAutoShortUrlFirst.Items2"), resources.GetString("ComboBoxAutoShortUrlFirst.Items3"), resources.GetString("ComboBoxAutoShortUrlFirst.Items4")}) resources.ApplyResources(Me.ComboBoxAutoShortUrlFirst, "ComboBoxAutoShortUrlFirst") Me.ComboBoxAutoShortUrlFirst.Name = "ComboBoxAutoShortUrlFirst" ' diff --git a/Tween/Setting.resx b/Tween/Setting.resx index f11ddc50..d79fa9ed 100644 --- a/Tween/Setting.resx +++ b/Tween/Setting.resx @@ -4105,12 +4105,9 @@ twurl.nl - u.nu - - bit.ly - + j.mp diff --git a/Tween/ShortUrl.vb b/Tween/ShortUrl.vb index 0c15e8e5..4bf9d99b 100644 --- a/Tween/ShortUrl.vb +++ b/Tween/ShortUrl.vb @@ -28,7 +28,6 @@ Public Class ShortUrl "http://tumblr.com/", _ "http://www.qurl.com/", _ "http://digg.com/", _ - "http://u.nu/", _ "http://ustre.am/", _ "http://pic.gd/", _ "http://airme.us/", _ @@ -178,20 +177,6 @@ Public Class ShortUrl If Not content.StartsWith("http://twurl.nl/") Then Return "Can't convert" End If - Case UrlConverter.Unu - If SrcUrl.StartsWith("http") Then - If "http://u.nu/xxxx".Length > src.Length AndAlso Not src.Contains("?") AndAlso Not src.Contains("#") Then - ' 明らかに長くなると推測できる場合は圧縮しない - content = src - Exit Select - End If - If Not (New HttpVarious).PostData("http://u.nu/unu-api-simple?url=" + SrcUrl, Nothing, content) Then - Return "Can't convert" - End If - End If - If Not content.StartsWith("http://u.nu") Then - Return "Can't convert" - End If Case UrlConverter.Bitly, UrlConverter.Jmp Dim BitlyLogin As String = "tweenapi" Dim BitlyApiKey As String = "R_c5ee0e30bdfff88723c4457cc331886b" diff --git a/Tween/Tween.Designer.vb b/Tween/Tween.Designer.vb index 57afffe7..e97b00cb 100644 --- a/Tween/Tween.Designer.vb +++ b/Tween/Tween.Designer.vb @@ -192,7 +192,6 @@ Partial Class TweenMain Me.TinyURLToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.IsgdToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TwurlnlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.UnuToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BitlyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.JmpStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UpdateFollowersMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() @@ -1258,7 +1257,7 @@ Partial Class TweenMain ' 'TinyUrlConvertToolStripMenuItem ' - Me.TinyUrlConvertToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UrlConvertAutoToolStripMenuItem, Me.UrlUndoToolStripMenuItem, Me.TinyURLToolStripMenuItem, Me.IsgdToolStripMenuItem, Me.TwurlnlToolStripMenuItem, Me.UnuToolStripMenuItem, Me.BitlyToolStripMenuItem, Me.JmpStripMenuItem}) + Me.TinyUrlConvertToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UrlConvertAutoToolStripMenuItem, Me.UrlUndoToolStripMenuItem, Me.TinyURLToolStripMenuItem, Me.IsgdToolStripMenuItem, Me.TwurlnlToolStripMenuItem, Me.BitlyToolStripMenuItem, Me.JmpStripMenuItem}) Me.TinyUrlConvertToolStripMenuItem.Name = "TinyUrlConvertToolStripMenuItem" resources.ApplyResources(Me.TinyUrlConvertToolStripMenuItem, "TinyUrlConvertToolStripMenuItem") ' @@ -1287,11 +1286,6 @@ Partial Class TweenMain Me.TwurlnlToolStripMenuItem.Name = "TwurlnlToolStripMenuItem" resources.ApplyResources(Me.TwurlnlToolStripMenuItem, "TwurlnlToolStripMenuItem") ' - 'UnuToolStripMenuItem - ' - Me.UnuToolStripMenuItem.Name = "UnuToolStripMenuItem" - resources.ApplyResources(Me.UnuToolStripMenuItem, "UnuToolStripMenuItem") - ' 'BitlyToolStripMenuItem ' Me.BitlyToolStripMenuItem.Name = "BitlyToolStripMenuItem" @@ -1836,7 +1830,6 @@ Partial Class TweenMain Friend WithEvents TraceOutToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents TwurlnlToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents TabRenameMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents UnuToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents BitlyToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ApiInfoMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents IdeographicSpaceToSpaceToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem diff --git a/Tween/Tween.resx b/Tween/Tween.resx index e38c97c4..83af0077 100644 --- a/Tween/Tween.resx +++ b/Tween/Tween.resx @@ -229,7 +229,7 @@ ハッシュタグ設定 - 238, 214 + 281, 214 ContextMenuPostMode @@ -288,105 +288,6 @@ Horizontal - - Bottom - - - 130, 99 - - - 188, 22 - - - タブ作成(&N)... - - - 188, 22 - - - タブ名の変更(&R) - - - 185, 6 - - - 188, 22 - - - 未読管理(&U) - - - 188, 22 - - - 新着通知表示(&Q) - - - 121, 26 - - - 再生するwavファイルを指定してください - - - 185, 6 - - - 188, 22 - - - 振り分けルール編集(&F)... - - - 185, 6 - - - 188, 22 - - - このタブの発言をクリア(&C) - - - 185, 6 - - - 188, 22 - - - タブ削除(&D) - - - 189, 206 - - - ContextMenuTabProperty - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - 17, 99 - - - 16, 16 - - - Disable - - - 0, 0 - - - 0, 0, 0, 0 - - - 453, 164 - - - 0 - ListTab @@ -426,24 +327,6 @@ True - - Fill - - - Off - - - 0, 0 - - - 453, 136 - - - Zoom - - - 5 - ImageSelectedPicture @@ -456,1001 +339,1328 @@ 0 - - Fill + + ImagePathPanel - - 57, 3 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 161, 19 + + ImageSelectionPanel - + 1 - - ImagefilePathText + + Fill - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - ImagePathPanel + + 453, 164 - - 0 + + 1 - - Right + + False - - Off + + ImageSelectionPanel - - 218, 3 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 22, 22 + + SplitContainer1.Panel1 - - 2 + + 1 - - ... + + Fill - - FilePickButton + + 0, 0 - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 453, 164 - - ImagePathPanel + + 2 - - 1 + + False - - Right + + ProfilePanel - - Off + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 240, 3 + + SplitContainer1.Panel1 - - 57, 22 + + 2 - - 3 + + SplitContainer1.Panel1 - - 投稿先 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + SplitContainer1 - - Label2 + + 0 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - ImagePathPanel + + 0, 0 - - 2 + + Fill - - Right + + 0, 0 - - TwitPic + + Horizontal - - TwitVideo + + 3 - - 297, 3 + + UserPicture - - 97, 20 + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + TableLayoutPanel1 - - ImageServiceCombo + + 0 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DateTimeLabel - - ImagePathPanel + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + TableLayoutPanel1 - - Right + + 1 - - Off + + NameLabel - - 394, 3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 56, 22 + + TableLayoutPanel1 - - 5 + + 2 - - Cancel + + PostBrowser - - ImageCancelButton + + System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TableLayoutPanel1 - - ImagePathPanel + + 3 - - 4 + + Fill - - Left + + 0, 0 - - Off + + 2 - - 3, 3 + + 453, 99 - - 54, 22 + + 1 - + + TableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer2.Panel1 + + 0 - - ファイル + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="UserPicture" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /><Control Name="DateTimeLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="NameLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="PostBrowser" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /></Controls><Columns Styles="Absolute,56,Percent,100,Absolute,129" /><Rows Styles="Absolute,17,Percent,100" /></TableLayoutSettings> - - MiddleLeft + + SplitContainer2.Panel1 - - Label1 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SplitContainer2 - - ImagePathPanel + + 0 - - 5 + + 0 - - Bottom + + Fill - - 0, 136 + + 0, 0 - - 3, 3, 3, 3 + + 365, 19 - - 453, 28 + + 1 - - 0 + + StatusText - - ImagePathPanel + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SplitContainer2.Panel2 - - ImageSelectionPanel + + 0 - - 1 + + Right - - Fill + + Off - - 0, 0 + + 365, 0 - - 453, 164 + + 44, 25 - - 1 + + 0 - - False + + 999 - - ImageSelectionPanel + + MiddleCenter - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + lblLen - - SplitContainer1.Panel1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + SplitContainer2.Panel2 + + 1 - - Fill + + Right - - 0, 0 + + Off - - 453, 164 + + 409, 0 - + + 44, 25 + + 2 - - False + + Post - - ProfilePanel + + PostButton - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SplitContainer1.Panel1 + + SplitContainer2.Panel2 - + 2 - - SplitContainer1.Panel1 + + SplitContainer2.Panel2 - + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SplitContainer1 + + SplitContainer2 - - 0 + + 1 - - Fill + + 19 - - 0, 0 + + 453, 126 - - Fill + + 99 - - 0, 0 + + 2 - - Horizontal + + 1 - - 3 + + SplitContainer2 - - 635, 58 - - - 210, 22 - - - フォローする(&F) + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 210, 22 + + SplitContainer3.Panel1 - - フォロー解除(&N) + + 0 - - 210, 22 + + SplitContainer3.Panel1 - - 相互フォロー状態表示(&H) + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 210, 22 + + SplitContainer3 - - リスト管理(&L) + + 0 - - 207, 6 + + Fill - - 210, 22 + + Off - - プロフィール表示(&P) + + 0, 0 - - 210, 22 + + 77, 126 - - このユーザーの発言を検索(&S) + + Zoom - - 207, 6 + + 1 - - 210, 22 + + PreviewPicture - - IconName + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 210, 22 + + SplitContainer3.Panel2 - - 保存(&I)... + + 0 - - 211, 192 + + Right - - ContextMenuUserPicture + + Off - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 77, 0 - - Off + + 17, 126 - - 3, 3 + + 0 - - 50, 50 + + PreviewScrollBar - - Zoom + + System.Windows.Forms.VScrollBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + SplitContainer3.Panel2 - - UserPicture + + 1 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SplitContainer3.Panel2 - - TableLayoutPanel1 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + SplitContainer3 - - Top, Bottom, Right + + 1 - - Off + + 453, 126 - - 327, 3 + + 355 - - 3, 3, 3, 0 + + 2 - - 123, 14 + + SplitContainer3 - - 1 + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Label1 + + SplitContainer1.Panel2 - - MiddleRight + + 0 - - DateTimeLabel + + SplitContainer1.Panel2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TableLayoutPanel1 + + SplitContainer1 - + 1 - - True + + 23 - - Fill + + 457, 300 - - MS UI Gothic, 9pt, style=Bold + + 168 - - Off + + 2 - - 59, 3 + + 0 - - 3, 3, 3, 0 + + SplitContainer1 - - 262, 14 + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + ToolStripContainer1.ContentPanel + + 0 - - LblName + + 457, 300 - - MiddleLeft + + ToolStripContainer1.ContentPanel - - NameLabel + + System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripContainer1 - - TableLayoutPanel1 + + 0 - - 2 + + Fill - - 480, 17 - - - 180, 22 + + ToolStripContainer1.LeftToolStripPanel - - Google(&G) + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180, 22 + + ToolStripContainer1 - - Wikipedia(&W) + + 1 - - 180, 22 + + 0, 0 - - Twitter検索(&Y) + + ToolStripContainer1.RightToolStripPanel - - 180, 22 + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Twitter Search(&S) + + ToolStripContainer1 - - 180, 22 + + 2 - - 現在のタブ(&L) + + 457, 353 - - 210, 22 + + 0 - - 選択文字列で検索(&S) + + ToolStripContainer1 - - 207, 6 + + 143, 17 + + + None - - 210, 22 + + 0, 0 - - 選択文字列をコピー(&C) + + 457, 26 - - False + + 0 - - 210, 22 + + MenuStrip1 - - URLをコピー(&U) + + MenuStrip1 - - 210, 22 + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - すべて選択(&A) + + ToolStripContainer1.TopToolStripPanel - - 207, 6 + + 0 - - 210, 22 + + ToolStripContainer1.TopToolStripPanel - - フォローする(&F) + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 210, 22 + + ToolStripContainer1 - - フォロー解除(&N) + + 3 - - 210, 22 + + ToolStripContainer1 - - 相互フォロー状態表示(&R) + + System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 210, 22 + + $this - - 全ユーザーのフォロー状態(&A) + + 6 - - 207, 6 + + Bottom - - 210, 22 + + 130, 99 + + + 189, 206 - - プロフィール表示(&P) + + ContextMenuTabProperty - - 210, 22 + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - このユーザーの発言を検索(&F) + + Fill - - 207, 6 + + 17, 99 + + + 16, 16 - - 210, 22 + + Disable - - ID振分ルール作成(&I) + + 0, 0 - - 210, 22 + + 0, 0, 0, 0 - - リスト管理(&L) + + 453, 164 - - 207, 6 + + 0 - - 210, 22 + + ListTab + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TimelinePanel + + + 0 + + + 188, 22 + + + タブ作成(&N)... + + + 188, 22 + + + タブ名の変更(&R) + + + 185, 6 + + + 188, 22 + + + 未読管理(&U) + + + 188, 22 + + + 新着通知表示(&Q) + + + 121, 26 + + + 再生するwavファイルを指定してください + + + 185, 6 + + + 188, 22 + + + 振り分けルール編集(&F)... + + + 185, 6 + + + 188, 22 + + + このタブの発言をクリア(&C) + + + 185, 6 + + + 188, 22 + + + タブ削除(&D) + + + Fill + + + Off + + + 0, 0 + + + 453, 136 + + + Zoom + + + 5 + + + ImageSelectedPicture + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImageSelectionPanel + + + 0 + + + ImagefilePathText + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 0 + + + FilePickButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 1 + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 2 + + + ImageServiceCombo + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 3 + + + ImageCancelButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 4 + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 5 + + + Bottom + + + 0, 136 + + + 3, 3, 3, 3 + + + 453, 28 + + + 0 + + + ImagePathPanel + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImageSelectionPanel + + + 1 + + + Fill + + + 57, 3 + + + 161, 19 + + + 1 + + + ImagefilePathText + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 0 + + + Right + + + Off + + + 218, 3 + + + 22, 22 + + + 2 + + + ... + + + FilePickButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 1 + + + Right + + + Off + + + 240, 3 + + + 57, 22 + + + 3 + + + 投稿先 + + + MiddleRight + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImagePathPanel + + + 2 + + + Right + + + TwitPic + + + TwitVideo + + + 297, 3 + + + 97, 20 + + + 4 + + + ImageServiceCombo + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ハッシュタグを固定(&H) + + ImagePathPanel - - 211, 320 + + 3 - - ContextMenuPostBrowser + + Right - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Off - - Fill + + 394, 3 - - 59, 20 + + 56, 22 - - 391, 76 + + 5 - - 6 + + Cancel - - PostBrowser + + ImageCancelButton - - System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TableLayoutPanel1 + + ImagePathPanel - - 3 + + 4 - - Fill + + Left - - 0, 0 + + Off - - 2 + + 3, 3 - - 453, 99 + + 54, 22 - - 1 + + 0 - - TableLayoutPanel1 + + ファイル - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MiddleLeft - - SplitContainer2.Panel1 + + Label1 - - 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="UserPicture" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /><Control Name="DateTimeLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="NameLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="PostBrowser" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /></Controls><Columns Styles="Absolute,56,Percent,100,Absolute,129" /><Rows Styles="Absolute,17,Percent,100" /></TableLayoutSettings> + + ImagePathPanel - - SplitContainer2.Panel1 + + 5 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 635, 58 + + + 211, 192 - - SplitContainer2 + + ContextMenuUserPicture - - 0 + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + Off - - Fill + + 3, 3 - - 0, 0 + + 50, 50 - - 365, 19 + + Zoom - - 1 + + 5 - - StatusText + + UserPicture - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SplitContainer2.Panel2 + + TableLayoutPanel1 - + 0 - - Right - - - Off + + 210, 22 - - 365, 0 + + フォローする(&F) - - 44, 25 + + 210, 22 - - 0 + + フォロー解除(&N) - - 999 + + 210, 22 - - MiddleCenter + + 相互フォロー状態表示(&H) - - lblLen + + 210, 22 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + リスト管理(&L) - - SplitContainer2.Panel2 + + 207, 6 - - 1 + + 210, 22 - - Right + + プロフィール表示(&P) - - Off + + 210, 22 - - 409, 0 + + このユーザーの発言を検索(&S) - - 44, 25 + + 207, 6 - - 2 + + 210, 22 - - Post + + IconName - - PostButton + + 210, 22 - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 保存(&I)... - - SplitContainer2.Panel2 + + Top, Bottom, Right - - 2 + + Off - - SplitContainer2.Panel2 + + 327, 3 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3, 3, 0 - - SplitContainer2 + + 123, 14 - + 1 - - 19 + + Label1 - - 453, 126 + + MiddleRight - - 99 + + DateTimeLabel - - 2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + TableLayoutPanel1 + + 1 - - SplitContainer2 + + True - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - SplitContainer3.Panel1 + + MS UI Gothic, 9pt, style=Bold - - 0 + + Off - - SplitContainer3.Panel1 + + 59, 3 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3, 3, 0 - - SplitContainer3 + + 262, 14 - + 0 - - Fill - - - Off - - - 0, 0 + + LblName - - 77, 126 + + MiddleLeft - - Zoom + + NameLabel - - 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PreviewPicture + + TableLayoutPanel1 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - SplitContainer3.Panel2 + + 480, 17 + + + 211, 320 - - 0 + + ContextMenuPostBrowser - - Right + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Off + + Fill - - 77, 0 + + 59, 20 - - 17, 126 + + 391, 76 - - 0 + + 6 - - PreviewScrollBar + + PostBrowser - - System.Windows.Forms.VScrollBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SplitContainer3.Panel2 + + TableLayoutPanel1 - - 1 + + 3 - - SplitContainer3.Panel2 + + 210, 22 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 選択文字列で検索(&S) - - SplitContainer3 + + 180, 22 - - 1 + + Google(&G) - - 453, 126 + + 180, 22 - - 355 + + Wikipedia(&W) - - 2 + + 180, 22 - - SplitContainer3 + + Twitter検索(&Y) - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 180, 22 - - SplitContainer1.Panel2 + + Twitter Search(&S) - - 0 + + 180, 22 - - SplitContainer1.Panel2 + + 現在のタブ(&L) - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 207, 6 - - SplitContainer1 + + 210, 22 - - 1 + + 選択文字列をコピー(&C) - - 23 + + False - - 457, 300 + + 210, 22 - - 168 + + URLをコピー(&U) - - 2 + + 210, 22 - - 0 + + すべて選択(&A) - - SplitContainer1 + + 207, 6 - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 210, 22 - - ToolStripContainer1.ContentPanel + + フォローする(&F) - - 0 + + 210, 22 - - 457, 300 + + フォロー解除(&N) - - ToolStripContainer1.ContentPanel + + 210, 22 - - System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 相互フォロー状態表示(&R) - - ToolStripContainer1 + + 210, 22 - - 0 + + 全ユーザーのフォロー状態(&A) - - Fill + + 207, 6 - - ToolStripContainer1.LeftToolStripPanel + + 210, 22 - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + プロフィール表示(&P) - - ToolStripContainer1 + + 210, 22 - - 1 + + このユーザーの発言を検索(&F) - - 0, 0 + + 207, 6 - - ToolStripContainer1.RightToolStripPanel + + 210, 22 - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ID振分ルール作成(&I) - - ToolStripContainer1 + + 210, 22 - - 2 + + リスト管理(&L) - - 457, 353 + + 207, 6 - - 0 + + 210, 22 - - ToolStripContainer1 + + ハッシュタグを固定(&H) - - 143, 17 - - - None + + 85, 22 + + + ファイル(&F) 189, 22 @@ -1497,11 +1707,11 @@ 終了(&X) - - 85, 22 + + 61, 22 - - ファイル(&F) + + 編集(&E) 259, 22 @@ -1566,11 +1776,11 @@ 抽出条件入力(&Q) - - 61, 22 + + 63, 22 - - 編集(&E) + + 操作(&O) Ctrl+R @@ -1659,6 +1869,12 @@ プロフィール表示 + + 267, 22 + + + 開く(&O) + Ctrl+H @@ -1722,11 +1938,11 @@ RTした人のホームを開く(&R) - + 267, 22 - - 開く(&O) + + 振り分けルール作成(&C) 227, 22 @@ -1740,12 +1956,6 @@ ID振り分けルール作成(&I) - - 267, 22 - - - 振り分けルール作成(&C) - 267, 22 @@ -1755,6 +1965,12 @@ 264, 6 + + 267, 22 + + + 未読状態変更(&H) + Ctrl+B @@ -1773,12 +1989,6 @@ 未読にする(&U) - - 267, 22 - - - 未読状態変更(&H) - 267, 22 @@ -1824,11 +2034,11 @@ 前データを取得(&I) - - 63, 22 + + 62, 22 - - 操作(&O) + + タブ(&T) 226, 22 @@ -1890,11 +2100,17 @@ タブ削除(&D) - - 62, 22 + + 98, 22 - - タブ(&T) + + その他機能(&C) + + + 280, 22 + + + 入力欄のURLを短縮変換 Ctrl+L @@ -1932,12 +2148,6 @@ twurl.nl - - 242, 22 - - - u.nu - 242, 22 @@ -1950,12 +2160,6 @@ j.mp - - 280, 22 - - - 入力欄のURLを短縮変換 - 280, 22 @@ -2031,11 +2235,11 @@ リスト編集 - - 98, 22 + + 75, 22 - - その他機能(&C) + + ヘルプ(&H) F1 @@ -2079,18 +2283,6 @@ Tweenについて(&A)... - - 179, 22 - - - PostClassのダンプ - - - 179, 22 - - - TraceOut出力 - 227, 22 @@ -2100,63 +2292,30 @@ False - - 75, 22 - - - ヘルプ(&H) - - - 0, 0 - - - 457, 26 - - - 0 - - - MenuStrip1 - - - MenuStrip1 - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripContainer1.TopToolStripPanel - - - 0 - - - ToolStripContainer1.TopToolStripPanel - - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripContainer1 - - - 3 - - - ToolStripContainer1 + + 179, 22 - - System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PostClassのダンプ - - $this + + 179, 22 - - 6 + + TraceOut出力 443, 58 + + 183, 418 + + + ContextMenuOperate + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 182, 22 @@ -2214,6 +2373,12 @@ プロフィール表示 + + 182, 22 + + + 開く(&O) + 230, 22 @@ -2256,11 +2421,11 @@ RTした人のホームを開く(&R) - + 182, 22 - - 開く(&O) + + 振り分けルール作成(&C) 239, 22 @@ -2274,12 +2439,6 @@ ID振り分けルール作成... - - 182, 22 - - - 振り分けルール作成(&C) - 182, 22 @@ -2289,6 +2448,12 @@ 179, 6 + + 182, 22 + + + 未読状態変更(&H) + 154, 22 @@ -2301,12 +2466,6 @@ 未読にする - - 182, 22 - - - 未読状態変更(&H) - 182, 22 @@ -2340,18 +2499,18 @@ 前データを取得(&I) - - 183, 418 + + 276, 58 + + + 169, 154 - - ContextMenuOperate + + ContextMenuFile - + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 276, 58 - 168, 22 @@ -2400,15 +2559,6 @@ 終了(&X) - - 169, 154 - - - ContextMenuFile - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 155, 58 @@ -3258,12 +3408,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnuToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - BitlyToolStripMenuItem diff --git a/Tween/Tween.vb b/Tween/Tween.vb index cc743c6e..83e5a55d 100644 --- a/Tween/Tween.vb +++ b/Tween/Tween.vb @@ -686,6 +686,12 @@ Public Class TweenMain SettingDialog.PlaySound = _cfgCommon.PlaySound SettingDialog.DateTimeFormat = _cfgCommon.DateTimeFormat SettingDialog.LimitBalloon = _cfgCommon.LimitBalloon + + '廃止サービスが選択されていた場合bit.lyへ読み替え + If _cfgCommon.AutoShortUrlFirst < 0 Then + _cfgCommon.AutoShortUrlFirst = Tween.UrlConverter.Bitly + End If + SettingDialog.AutoShortUrlFirst = _cfgCommon.AutoShortUrlFirst SettingDialog.TabIconDisp = _cfgCommon.TabIconDisp SettingDialog.ReplyIconState = _cfgCommon.ReplyIconState @@ -749,7 +755,7 @@ Public Class TweenMain _FirstRefreshFlags = True _FirstListsRefreshFlags = True End If - + 'ハッシュタグ関連 HashSupl = New AtIdSupplement(_cfgCommon.HashTags, "#") HashMgr = New HashtagManage(HashSupl, _ @@ -840,7 +846,7 @@ Public Class TweenMain End If If SettingDialog.HotkeyEnabled Then - '''グローバルホットキーの登録。設定で変更可能にするかも + '''グローバルホットキーの登録 Dim modKey As HookGlobalHotkey.ModKeys = HookGlobalHotkey.ModKeys.None If (SettingDialog.HotkeyMod And Keys.Alt) = Keys.Alt Then modKey = modKey Or HookGlobalHotkey.ModKeys.Alt If (SettingDialog.HotkeyMod And Keys.Control) = Keys.Control Then modKey = modKey Or HookGlobalHotkey.ModKeys.Ctrl @@ -8065,10 +8071,6 @@ RETRY: TabRename(_rclickTabName) End Sub - Private Sub UnuToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles UnuToolStripMenuItem.Click - UrlConvert(UrlConverter.Unu) - End Sub - Private Sub BitlyToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles BitlyToolStripMenuItem.Click UrlConvert(UrlConverter.Bitly) End Sub -- 2.11.0