svnno****@sourc*****
svnno****@sourc*****
2011年 9月 26日 (月) 13:08:06 JST
Revision: 1600
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1600
Author: kiri_feather
Date: 2011-09-26 13:08:06 +0900 (Mon, 26 Sep 2011)
Log Message:
-----------
設定画面キャンセル時に認証済みでも認証警告出るので対応
画像を内蔵ブラウザで開くオプション追加
AuthBrowserで画像開けるように
更新ダイアログをShowからShowDialogに変更して、メイン画面触れないように
lockerz等リファラが不正でサムネイル取得できなかったので対応
URLコピーで展開後URLをコピーするよう変更
Modified Paths:
--------------
trunk/Tween/AppendSettingDialog.Designer.vb
trunk/Tween/AppendSettingDialog.en.resx
trunk/Tween/AppendSettingDialog.resx
trunk/Tween/AppendSettingDialog.vb
trunk/Tween/AuthBrowser.Designer.vb
trunk/Tween/AuthBrowser.vb
trunk/Tween/DialogAsShieldIcon.vb
trunk/Tween/Setting/SettingCommon.vb
trunk/Tween/Thumbnail.vb
trunk/Tween/Tween.vb
-------------- next part --------------
Modified: trunk/Tween/AppendSettingDialog.Designer.vb
===================================================================
--- trunk/Tween/AppendSettingDialog.Designer.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/AppendSettingDialog.Designer.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -26,19 +26,8 @@
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(AppendSettingDialog))
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.TreeViewSetting = New System.Windows.Forms.TreeView()
- Me.BasedPanel = New System.Windows.Forms.Panel()
- Me.AuthUserCombo = New System.Windows.Forms.ComboBox()
- Me.GroupBox2 = New System.Windows.Forms.GroupBox()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.EmailText = New System.Windows.Forms.TextBox()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.FollowCheckBox = New System.Windows.Forms.CheckBox()
- Me.Label43 = New System.Windows.Forms.Label()
- Me.CreateAccountButton = New System.Windows.Forms.Button()
- Me.StartAuthButton = New System.Windows.Forms.Button()
- Me.AuthClearButton = New System.Windows.Forms.Button()
- Me.Label4 = New System.Windows.Forms.Label()
Me.ActionPanel = New System.Windows.Forms.Panel()
+ Me.OpenPictureBuiltinBrowser = New System.Windows.Forms.CheckBox()
Me.Label38 = New System.Windows.Forms.Label()
Me.ListDoubleClickActionComboBox = New System.Windows.Forms.ComboBox()
Me.CheckOpenUserTimeline = New System.Windows.Forms.CheckBox()
@@ -77,6 +66,18 @@
Me.CheckShowGrid = New System.Windows.Forms.CheckBox()
Me.chkUnreadStyle = New System.Windows.Forms.CheckBox()
Me.OneWayLv = New System.Windows.Forms.CheckBox()
+ Me.BasedPanel = New System.Windows.Forms.Panel()
+ Me.AuthUserCombo = New System.Windows.Forms.ComboBox()
+ Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.EmailText = New System.Windows.Forms.TextBox()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.FollowCheckBox = New System.Windows.Forms.CheckBox()
+ Me.Label43 = New System.Windows.Forms.Label()
+ Me.CreateAccountButton = New System.Windows.Forms.Button()
+ Me.StartAuthButton = New System.Windows.Forms.Button()
+ Me.AuthClearButton = New System.Windows.Forms.Button()
+ Me.Label4 = New System.Windows.Forms.Label()
Me.ShortUrlPanel = New System.Windows.Forms.Panel()
Me.ShortenTcoCheck = New System.Windows.Forms.CheckBox()
Me.CheckForceResolve = New System.Windows.Forms.CheckBox()
@@ -282,11 +283,11 @@
Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout()
Me.SplitContainer1.SuspendLayout()
- Me.BasedPanel.SuspendLayout()
- Me.GroupBox2.SuspendLayout()
Me.ActionPanel.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.TweetPrvPanel.SuspendLayout()
+ Me.BasedPanel.SuspendLayout()
+ Me.GroupBox2.SuspendLayout()
Me.ShortUrlPanel.SuspendLayout()
Me.FontPanel.SuspendLayout()
Me.GroupBox1.SuspendLayout()
@@ -319,9 +320,9 @@
'
resources.ApplyResources(Me.SplitContainer1.Panel2, "SplitContainer1.Panel2")
Me.SplitContainer1.Panel2.BackColor = System.Drawing.SystemColors.Control
- Me.SplitContainer1.Panel2.Controls.Add(Me.BasedPanel)
Me.SplitContainer1.Panel2.Controls.Add(Me.ActionPanel)
Me.SplitContainer1.Panel2.Controls.Add(Me.TweetPrvPanel)
+ Me.SplitContainer1.Panel2.Controls.Add(Me.BasedPanel)
Me.SplitContainer1.Panel2.Controls.Add(Me.ShortUrlPanel)
Me.SplitContainer1.Panel2.Controls.Add(Me.FontPanel)
Me.SplitContainer1.Panel2.Controls.Add(Me.FontPanel2)
@@ -348,102 +349,10 @@
Me.TreeViewSetting.ShowLines = False
Me.ToolTip1.SetToolTip(Me.TreeViewSetting, resources.GetString("TreeViewSetting.ToolTip"))
'
- 'BasedPanel
- '
- resources.ApplyResources(Me.BasedPanel, "BasedPanel")
- Me.BasedPanel.Controls.Add(Me.AuthUserCombo)
- Me.BasedPanel.Controls.Add(Me.GroupBox2)
- Me.BasedPanel.Controls.Add(Me.CreateAccountButton)
- Me.BasedPanel.Controls.Add(Me.StartAuthButton)
- Me.BasedPanel.Controls.Add(Me.AuthClearButton)
- Me.BasedPanel.Controls.Add(Me.Label4)
- Me.BasedPanel.Name = "BasedPanel"
- Me.ToolTip1.SetToolTip(Me.BasedPanel, resources.GetString("BasedPanel.ToolTip"))
- '
- 'AuthUserCombo
- '
- resources.ApplyResources(Me.AuthUserCombo, "AuthUserCombo")
- Me.AuthUserCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.AuthUserCombo.FormattingEnabled = True
- Me.AuthUserCombo.Name = "AuthUserCombo"
- Me.ToolTip1.SetToolTip(Me.AuthUserCombo, resources.GetString("AuthUserCombo.ToolTip"))
- '
- 'GroupBox2
- '
- resources.ApplyResources(Me.GroupBox2, "GroupBox2")
- Me.GroupBox2.Controls.Add(Me.Label1)
- Me.GroupBox2.Controls.Add(Me.EmailText)
- Me.GroupBox2.Controls.Add(Me.Label6)
- Me.GroupBox2.Controls.Add(Me.FollowCheckBox)
- Me.GroupBox2.Controls.Add(Me.Label43)
- Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.TabStop = False
- Me.ToolTip1.SetToolTip(Me.GroupBox2, resources.GetString("GroupBox2.ToolTip"))
- '
- 'Label1
- '
- resources.ApplyResources(Me.Label1, "Label1")
- Me.Label1.Name = "Label1"
- Me.ToolTip1.SetToolTip(Me.Label1, resources.GetString("Label1.ToolTip"))
- '
- 'EmailText
- '
- resources.ApplyResources(Me.EmailText, "EmailText")
- Me.EmailText.Name = "EmailText"
- Me.ToolTip1.SetToolTip(Me.EmailText, resources.GetString("EmailText.ToolTip"))
- '
- 'Label6
- '
- resources.ApplyResources(Me.Label6, "Label6")
- Me.Label6.Name = "Label6"
- Me.ToolTip1.SetToolTip(Me.Label6, resources.GetString("Label6.ToolTip"))
- '
- 'FollowCheckBox
- '
- resources.ApplyResources(Me.FollowCheckBox, "FollowCheckBox")
- Me.FollowCheckBox.Checked = True
- Me.FollowCheckBox.CheckState = System.Windows.Forms.CheckState.Checked
- Me.FollowCheckBox.Name = "FollowCheckBox"
- Me.ToolTip1.SetToolTip(Me.FollowCheckBox, resources.GetString("FollowCheckBox.ToolTip"))
- Me.FollowCheckBox.UseVisualStyleBackColor = True
- '
- 'Label43
- '
- resources.ApplyResources(Me.Label43, "Label43")
- Me.Label43.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
- Me.Label43.Name = "Label43"
- Me.ToolTip1.SetToolTip(Me.Label43, resources.GetString("Label43.ToolTip"))
- '
- 'CreateAccountButton
- '
- resources.ApplyResources(Me.CreateAccountButton, "CreateAccountButton")
- Me.CreateAccountButton.Name = "CreateAccountButton"
- Me.ToolTip1.SetToolTip(Me.CreateAccountButton, resources.GetString("CreateAccountButton.ToolTip"))
- Me.CreateAccountButton.UseVisualStyleBackColor = True
- '
- 'StartAuthButton
- '
- resources.ApplyResources(Me.StartAuthButton, "StartAuthButton")
- Me.StartAuthButton.Name = "StartAuthButton"
- Me.ToolTip1.SetToolTip(Me.StartAuthButton, resources.GetString("StartAuthButton.ToolTip"))
- Me.StartAuthButton.UseVisualStyleBackColor = True
- '
- 'AuthClearButton
- '
- resources.ApplyResources(Me.AuthClearButton, "AuthClearButton")
- Me.AuthClearButton.Name = "AuthClearButton"
- Me.ToolTip1.SetToolTip(Me.AuthClearButton, resources.GetString("AuthClearButton.ToolTip"))
- Me.AuthClearButton.UseVisualStyleBackColor = True
- '
- 'Label4
- '
- resources.ApplyResources(Me.Label4, "Label4")
- Me.Label4.Name = "Label4"
- Me.ToolTip1.SetToolTip(Me.Label4, resources.GetString("Label4.ToolTip"))
- '
'ActionPanel
'
resources.ApplyResources(Me.ActionPanel, "ActionPanel")
+ Me.ActionPanel.Controls.Add(Me.OpenPictureBuiltinBrowser)
Me.ActionPanel.Controls.Add(Me.Label38)
Me.ActionPanel.Controls.Add(Me.ListDoubleClickActionComboBox)
Me.ActionPanel.Controls.Add(Me.CheckOpenUserTimeline)
@@ -463,6 +372,13 @@
Me.ActionPanel.Name = "ActionPanel"
Me.ToolTip1.SetToolTip(Me.ActionPanel, resources.GetString("ActionPanel.ToolTip"))
'
+ 'OpenPictureBuiltinBrowser
+ '
+ resources.ApplyResources(Me.OpenPictureBuiltinBrowser, "OpenPictureBuiltinBrowser")
+ Me.OpenPictureBuiltinBrowser.Name = "OpenPictureBuiltinBrowser"
+ Me.ToolTip1.SetToolTip(Me.OpenPictureBuiltinBrowser, resources.GetString("OpenPictureBuiltinBrowser.ToolTip"))
+ Me.OpenPictureBuiltinBrowser.UseVisualStyleBackColor = True
+ '
'Label38
'
resources.ApplyResources(Me.Label38, "Label38")
@@ -748,6 +664,99 @@
Me.ToolTip1.SetToolTip(Me.OneWayLv, resources.GetString("OneWayLv.ToolTip"))
Me.OneWayLv.UseVisualStyleBackColor = True
'
+ 'BasedPanel
+ '
+ resources.ApplyResources(Me.BasedPanel, "BasedPanel")
+ Me.BasedPanel.Controls.Add(Me.AuthUserCombo)
+ Me.BasedPanel.Controls.Add(Me.GroupBox2)
+ Me.BasedPanel.Controls.Add(Me.CreateAccountButton)
+ Me.BasedPanel.Controls.Add(Me.StartAuthButton)
+ Me.BasedPanel.Controls.Add(Me.AuthClearButton)
+ Me.BasedPanel.Controls.Add(Me.Label4)
+ Me.BasedPanel.Name = "BasedPanel"
+ Me.ToolTip1.SetToolTip(Me.BasedPanel, resources.GetString("BasedPanel.ToolTip"))
+ '
+ 'AuthUserCombo
+ '
+ resources.ApplyResources(Me.AuthUserCombo, "AuthUserCombo")
+ Me.AuthUserCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.AuthUserCombo.FormattingEnabled = True
+ Me.AuthUserCombo.Name = "AuthUserCombo"
+ Me.ToolTip1.SetToolTip(Me.AuthUserCombo, resources.GetString("AuthUserCombo.ToolTip"))
+ '
+ 'GroupBox2
+ '
+ resources.ApplyResources(Me.GroupBox2, "GroupBox2")
+ Me.GroupBox2.Controls.Add(Me.Label1)
+ Me.GroupBox2.Controls.Add(Me.EmailText)
+ Me.GroupBox2.Controls.Add(Me.Label6)
+ Me.GroupBox2.Controls.Add(Me.FollowCheckBox)
+ Me.GroupBox2.Controls.Add(Me.Label43)
+ Me.GroupBox2.Name = "GroupBox2"
+ Me.GroupBox2.TabStop = False
+ Me.ToolTip1.SetToolTip(Me.GroupBox2, resources.GetString("GroupBox2.ToolTip"))
+ '
+ 'Label1
+ '
+ resources.ApplyResources(Me.Label1, "Label1")
+ Me.Label1.Name = "Label1"
+ Me.ToolTip1.SetToolTip(Me.Label1, resources.GetString("Label1.ToolTip"))
+ '
+ 'EmailText
+ '
+ resources.ApplyResources(Me.EmailText, "EmailText")
+ Me.EmailText.Name = "EmailText"
+ Me.ToolTip1.SetToolTip(Me.EmailText, resources.GetString("EmailText.ToolTip"))
+ '
+ 'Label6
+ '
+ resources.ApplyResources(Me.Label6, "Label6")
+ Me.Label6.Name = "Label6"
+ Me.ToolTip1.SetToolTip(Me.Label6, resources.GetString("Label6.ToolTip"))
+ '
+ 'FollowCheckBox
+ '
+ resources.ApplyResources(Me.FollowCheckBox, "FollowCheckBox")
+ Me.FollowCheckBox.Checked = True
+ Me.FollowCheckBox.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.FollowCheckBox.Name = "FollowCheckBox"
+ Me.ToolTip1.SetToolTip(Me.FollowCheckBox, resources.GetString("FollowCheckBox.ToolTip"))
+ Me.FollowCheckBox.UseVisualStyleBackColor = True
+ '
+ 'Label43
+ '
+ resources.ApplyResources(Me.Label43, "Label43")
+ Me.Label43.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+ Me.Label43.Name = "Label43"
+ Me.ToolTip1.SetToolTip(Me.Label43, resources.GetString("Label43.ToolTip"))
+ '
+ 'CreateAccountButton
+ '
+ resources.ApplyResources(Me.CreateAccountButton, "CreateAccountButton")
+ Me.CreateAccountButton.Name = "CreateAccountButton"
+ Me.ToolTip1.SetToolTip(Me.CreateAccountButton, resources.GetString("CreateAccountButton.ToolTip"))
+ Me.CreateAccountButton.UseVisualStyleBackColor = True
+ '
+ 'StartAuthButton
+ '
+ resources.ApplyResources(Me.StartAuthButton, "StartAuthButton")
+ Me.StartAuthButton.Name = "StartAuthButton"
+ Me.ToolTip1.SetToolTip(Me.StartAuthButton, resources.GetString("StartAuthButton.ToolTip"))
+ Me.StartAuthButton.UseVisualStyleBackColor = True
+ '
+ 'AuthClearButton
+ '
+ resources.ApplyResources(Me.AuthClearButton, "AuthClearButton")
+ Me.AuthClearButton.Name = "AuthClearButton"
+ Me.ToolTip1.SetToolTip(Me.AuthClearButton, resources.GetString("AuthClearButton.ToolTip"))
+ Me.AuthClearButton.UseVisualStyleBackColor = True
+ '
+ 'Label4
+ '
+ resources.ApplyResources(Me.Label4, "Label4")
+ Me.Label4.Name = "Label4"
+ Me.ToolTip1.SetToolTip(Me.Label4, resources.GetString("Label4.ToolTip"))
+ '
'ShortUrlPanel
'
resources.ApplyResources(Me.ShortUrlPanel, "ShortUrlPanel")
@@ -2290,16 +2299,16 @@
Me.SplitContainer1.Panel2.ResumeLayout(False)
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer1.ResumeLayout(False)
- Me.BasedPanel.ResumeLayout(False)
- Me.BasedPanel.PerformLayout()
- Me.GroupBox2.ResumeLayout(False)
- Me.GroupBox2.PerformLayout()
Me.ActionPanel.ResumeLayout(False)
Me.ActionPanel.PerformLayout()
Me.GroupBox3.ResumeLayout(False)
Me.GroupBox3.PerformLayout()
Me.TweetPrvPanel.ResumeLayout(False)
Me.TweetPrvPanel.PerformLayout()
+ Me.BasedPanel.ResumeLayout(False)
+ Me.BasedPanel.PerformLayout()
+ Me.GroupBox2.ResumeLayout(False)
+ Me.GroupBox2.PerformLayout()
Me.ShortUrlPanel.ResumeLayout(False)
Me.ShortUrlPanel.PerformLayout()
Me.FontPanel.ResumeLayout(False)
@@ -2585,4 +2594,5 @@
Friend WithEvents ShortenTcoCheck As System.Windows.Forms.CheckBox
Friend WithEvents IsListsIncludeRtsCheckBox As System.Windows.Forms.CheckBox
Friend WithEvents AuthUserCombo As System.Windows.Forms.ComboBox
+ Friend WithEvents OpenPictureBuiltinBrowser As System.Windows.Forms.CheckBox
End Class
Modified: trunk/Tween/AppendSettingDialog.en.resx
===================================================================
--- trunk/Tween/AppendSettingDialog.en.resx 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/AppendSettingDialog.en.resx 2011-09-26 04:08:06 UTC (rev 1600)
@@ -213,73 +213,16 @@
<data name="SplitContainer1.Panel1.ToolTip" xml:space="preserve">
<value />
</data>
- <data name="AuthUserCombo.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="Label1.Text" xml:space="preserve">
- <value>We recommend to follow @TweenApp.</value>
- </data>
- <data name="Label1.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="EmailText.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="Label6.ToolTip" xml:space="preserve">
- <value />
- </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="FollowCheckBox.Size" type="System.Drawing.Size, System.Drawing">
- <value>122, 16</value>
+ <data name="OpenPictureBuiltinBrowser.Size" type="System.Drawing.Size, System.Drawing">
+ <value>193, 16</value>
</data>
- <data name="FollowCheckBox.Text" xml:space="preserve">
- <value>Follow @TweenApp</value>
+ <data name="OpenPictureBuiltinBrowser.Text" xml:space="preserve">
+ <value>Open pictures in built-in browser</value>
</data>
- <data name="FollowCheckBox.ToolTip" xml:space="preserve">
+ <data name="OpenPictureBuiltinBrowser.ToolTip" xml:space="preserve">
<value />
</data>
- <data name="Label43.Text" xml:space="preserve">
- <value>This account will accept, and answer demanding and inquiring besides the upgrade and useful information are passed on.</value>
- </data>
- <data name="Label43.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="GroupBox2.Text" xml:space="preserve">
- <value>Tween support</value>
- </data>
- <data name="GroupBox2.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="CreateAccountButton.Text" xml:space="preserve">
- <value>Sign up for Twitter account</value>
- </data>
- <data name="CreateAccountButton.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="StartAuthButton.Text" xml:space="preserve">
- <value>Start Authentiation</value>
- </data>
- <data name="StartAuthButton.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="AuthClearButton.Text" xml:space="preserve">
- <value>Remove</value>
- </data>
- <data name="AuthClearButton.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
- <value>47, 12</value>
- </data>
- <data name="Label4.Text" xml:space="preserve">
- <value>Account</value>
- </data>
- <data name="Label4.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="BasedPanel.ToolTip" xml:space="preserve">
- <value />
- </data>
<data name="Label38.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 282</value>
</data>
@@ -310,9 +253,6 @@
<data name="ListDoubleClickActionComboBox.Items7" xml:space="preserve">
<value>Not bihavier</value>
</data>
- <data name="ListDoubleClickActionComboBox.Location" type="System.Drawing.Point, System.Drawing">
- <value>199, 277</value>
- </data>
<data name="ListDoubleClickActionComboBox.ToolTip" xml:space="preserve">
<value />
</data>
@@ -563,6 +503,72 @@
<data name="TweetPrvPanel.ToolTip" xml:space="preserve">
<value />
</data>
+ <data name="AuthUserCombo.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="Label1.Text" xml:space="preserve">
+ <value>We recommend to follow @TweenApp.</value>
+ </data>
+ <data name="Label1.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="EmailText.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="Label6.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="FollowCheckBox.Size" type="System.Drawing.Size, System.Drawing">
+ <value>122, 16</value>
+ </data>
+ <data name="FollowCheckBox.Text" xml:space="preserve">
+ <value>Follow @TweenApp</value>
+ </data>
+ <data name="FollowCheckBox.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="Label43.Text" xml:space="preserve">
+ <value>This account will accept, and answer demanding and inquiring besides the upgrade and useful information are passed on.</value>
+ </data>
+ <data name="Label43.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="GroupBox2.Text" xml:space="preserve">
+ <value>Tween support</value>
+ </data>
+ <data name="GroupBox2.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="CreateAccountButton.Text" xml:space="preserve">
+ <value>Sign up for Twitter account</value>
+ </data>
+ <data name="CreateAccountButton.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="StartAuthButton.Text" xml:space="preserve">
+ <value>Start Authentiation</value>
+ </data>
+ <data name="StartAuthButton.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="AuthClearButton.Text" xml:space="preserve">
+ <value>Remove</value>
+ </data>
+ <data name="AuthClearButton.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
+ <value>47, 12</value>
+ </data>
+ <data name="Label4.Text" xml:space="preserve">
+ <value>Account</value>
+ </data>
+ <data name="Label4.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="BasedPanel.ToolTip" xml:space="preserve">
+ <value />
+ </data>
<data name="ShortenTcoCheck.Size" type="System.Drawing.Size, System.Drawing">
<value>91, 16</value>
</data>
Modified: trunk/Tween/AppendSettingDialog.resx
===================================================================
--- trunk/Tween/AppendSettingDialog.resx 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/AppendSettingDialog.resx 2011-09-26 04:08:06 UTC (rev 1600)
@@ -228,8 +228,8 @@
<data name="Label11.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 12</value>
</data>
- <data name=">>AuthClearButton.Name" xml:space="preserve">
- <value>AuthClearButton</value>
+ <data name="CheckUnfavoritesEvent.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
</data>
<data name="Label81.Location" type="System.Drawing.Point, System.Drawing">
<value>83, 290</value>
@@ -276,8 +276,8 @@
<data name="btnAtTo.Text" xml:space="preserve">
<value>背景色</value>
</data>
- <data name="lblDetail.TabIndex" type="System.Int32, mscorlib">
- <value>16</value>
+ <data name=">>TextBox3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="CheckForceEventNotify.Size" type="System.Drawing.Size, System.Drawing">
<value>213, 16</value>
@@ -291,6 +291,9 @@
<data name="TextBitlyId.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
+ <data name=">>DMPeriod.Name" xml:space="preserve">
+ <value>DMPeriod</value>
+ </data>
<data name=">>LanguageCombo.Name" xml:space="preserve">
<value>LanguageCombo</value>
</data>
@@ -471,9 +474,6 @@
<data name="Label6.Size" type="System.Drawing.Size, System.Drawing">
<value>103, 12</value>
</data>
- <data name=">>Label29.Parent" xml:space="preserve">
- <value>CooperatePanel</value>
- </data>
<data name="Label72.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
@@ -824,9 +824,6 @@
<data name="UserstreamPeriod.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name="chkGetFav.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 93</value>
</data>
@@ -876,7 +873,7 @@
<value>True</value>
</data>
<data name=">>Label44.ZOrder" xml:space="preserve">
- <value>12</value>
+ <value>13</value>
</data>
<data name="Label28.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@@ -933,7 +930,7 @@
<value>ConnectionTimeOut</value>
</data>
<data name=">>Label57.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="CheckForceEventNotify.Text" xml:space="preserve">
<value>新着通知が無効でもイベントを通知する</value>
@@ -965,6 +962,9 @@
<data name=">>ChkNewMentionsBlink.Name" xml:space="preserve">
<value>ChkNewMentionsBlink</value>
</data>
+ <data name="OpenPictureBuiltinBrowser.ToolTip" xml:space="preserve">
+ <value />
+ </data>
<data name="Label27.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
@@ -1055,8 +1055,8 @@
<data name="HotkeyWin.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="StartAuthButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
+ <data name=">>Label47.Name" xml:space="preserve">
+ <value>Label47</value>
</data>
<data name="ReplyIconStateCombo.Items2" xml:space="preserve">
<value>アイコン変更＆点滅</value>
@@ -1077,7 +1077,7 @@
<value>4</value>
</data>
<data name=">>CheckFavRestrict.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>6</value>
</data>
<data name=">>CmbDateTimeFormat.ZOrder" xml:space="preserve">
<value>5</value>
@@ -1320,8 +1320,8 @@
<data name=">>CheckNicoms.Name" xml:space="preserve">
<value>CheckNicoms</value>
</data>
- <data name="btnDetailLink.TabIndex" type="System.Int32, mscorlib">
- <value>20</value>
+ <data name="CheckCloseToExit.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
<data name="CmbDateTimeFormat.Items2" xml:space="preserve">
<value>H:mm:ss yy/M/d</value>
@@ -1369,7 +1369,7 @@
<value>（なし）</value>
</data>
<data name=">>ListDoubleClickActionComboBox.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="CheckUserUpdateEvent.Location" type="System.Drawing.Point, System.Drawing">
<value>40, 145</value>
@@ -1539,6 +1539,9 @@
<data name=">>CheckShowGrid.Parent" xml:space="preserve">
<value>TweetPrvPanel</value>
</data>
+ <data name=">>CheckTinyURL.Name" xml:space="preserve">
+ <value>CheckTinyURL</value>
+ </data>
<data name=">>Label67.Parent" xml:space="preserve">
<value>GetCountPanel</value>
</data>
@@ -1632,6 +1635,9 @@
<data name="CheckFavRestrict.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 16</value>
</data>
+ <data name="EmailText.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
<data name=">>CheckOpenUserTimeline.Name" xml:space="preserve">
<value>CheckOpenUserTimeline</value>
</data>
@@ -1779,8 +1785,8 @@
<data name="Label30.Size" type="System.Drawing.Size, System.Drawing">
<value>117, 12</value>
</data>
- <data name="EmailText.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
+ <data name="OpenPictureBuiltinBrowser.Location" type="System.Drawing.Point, System.Drawing">
+ <value>24, 304</value>
</data>
<data name="Cancel.Text" xml:space="preserve">
<value>キャンセル</value>
@@ -1807,7 +1813,7 @@
<value>NoControl</value>
</data>
<data name=">>ActionPanel.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>0</value>
</data>
<data name=">>btnAtTo.Name" xml:space="preserve">
<value>btnAtTo</value>
@@ -1860,6 +1866,9 @@
<data name=">>TweetActPanel.Parent" xml:space="preserve">
<value>SplitContainer1.Panel2</value>
</data>
+ <data name="chkGetFav.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
<data name=">>lblAtFromTarget.ZOrder" xml:space="preserve">
<value>22</value>
</data>
@@ -1938,6 +1947,9 @@
<data name="HotkeyCheck.Text" xml:space="preserve">
<value>有効</value>
</data>
+ <data name="GroupBox3.ToolTip" xml:space="preserve">
+ <value />
+ </data>
<data name=">>UserstreamPeriod.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -1968,9 +1980,15 @@
<data name="Label15.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>Label59.Name" xml:space="preserve">
- <value>Label59</value>
+ <data name="ComboBoxTranslateLanguage.Items62" xml:space="preserve">
+ <value>Hungarian</value>
</data>
+ <data name="TweetActPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>518, 368</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>LabelProxyAddress.Parent" xml:space="preserve">
<value>ProxyPanel</value>
</data>
@@ -2004,15 +2022,15 @@
<data name=">>btnAtTarget.Name" xml:space="preserve">
<value>btnAtTarget</value>
</data>
- <data name="btnDetail.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
<data name="FoursquarePreviewHeightTextBox.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name=">>TreeViewSetting.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name=">>HotkeyCode.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="ComboBoxTranslateLanguage.Items18" xml:space="preserve">
<value>Basque</value>
</data>
@@ -2025,6 +2043,9 @@
<data name="FontPanel2.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
+ <data name="Label49.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
<data name="RadioProxyNone.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 19</value>
</data>
@@ -2061,8 +2082,8 @@
<data name="ComboBoxTranslateLanguage.Items81" xml:space="preserve">
<value>Romanian</value>
</data>
- <data name="TextBox3.Location" type="System.Drawing.Point, System.Drawing">
- <value>216, 150</value>
+ <data name="lblListBackcolor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>102, 19</value>
</data>
<data name=">>btnUnread.ZOrder" xml:space="preserve">
<value>7</value>
@@ -2160,8 +2181,8 @@
<data name=">>TwitterAPIText.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>Label17.ZOrder" xml:space="preserve">
- <value>3</value>
+ <data name=">>btnDetailBack.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Label7.Text" xml:space="preserve">
<value>Twitter検索更新間隔（秒）</value>
@@ -2349,6 +2370,9 @@
<data name=">>Label20.Parent" xml:space="preserve">
<value>GroupBox1</value>
</data>
+ <data name=">>Label43.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>Label21.ZOrder" xml:space="preserve">
<value>4</value>
</data>
@@ -2379,9 +2403,6 @@
<data name=">>LabelProxyAddress.ZOrder" xml:space="preserve">
<value>8</value>
</data>
- <data name=">>Label47.Name" xml:space="preserve">
- <value>Label47</value>
- </data>
<data name="BrowserPathText.ToolTip" xml:space="preserve">
<value />
</data>
@@ -2421,8 +2442,8 @@
<data name=">>Label21.Parent" xml:space="preserve">
<value>GetPeriodPanel</value>
</data>
- <data name="GroupBox3.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>Label67.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnSelf.ZOrder" xml:space="preserve">
<value>17</value>
@@ -2469,8 +2490,8 @@
<data name="lblAtTo.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="CheckFavEventUnread.Size" type="System.Drawing.Size, System.Drawing">
- <value>271, 16</value>
+ <data name="OpenPictureBuiltinBrowser.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
<data name="StartupReaded.ToolTip" xml:space="preserve">
<value />
@@ -2533,7 +2554,7 @@
<value>Disable</value>
</data>
<data name=">>chkReadOwnPost.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>9</value>
</data>
<data name=">>CheckListMemberRemovedEvent.Name" xml:space="preserve">
<value>CheckListMemberRemovedEvent</value>
@@ -2565,9 +2586,6 @@
<data name=">>lblTarget.ZOrder" xml:space="preserve">
<value>24</value>
</data>
- <data name="CheckAtIdSupple.Location" type="System.Drawing.Point, System.Drawing">
- <value>24, 146</value>
- </data>
<data name="ConnectionPanel.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@@ -2718,6 +2736,9 @@
<data name="UserTimelinePeriod.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Disable</value>
</data>
+ <data name="TextBox3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>216, 150</value>
+ </data>
<data name=">>CheckStartupFollowers.ZOrder" xml:space="preserve">
<value>1</value>
</data>
@@ -2928,6 +2949,9 @@
<data name=">>ReplyIconStateCombo.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>FontDialog1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.FontDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="Cancel.ToolTip" xml:space="preserve">
<value />
</data>
@@ -2940,8 +2964,8 @@
<data name=">>ProxyPanel.ZOrder" xml:space="preserve">
<value>13</value>
</data>
- <data name=">>Label16.Name" xml:space="preserve">
- <value>Label16</value>
+ <data name="CheckAtIdSupple.Location" type="System.Drawing.Point, System.Drawing">
+ <value>24, 146</value>
</data>
<data name="LabelProxyAddress.Location" type="System.Drawing.Point, System.Drawing">
<value>50, 85</value>
@@ -2961,8 +2985,8 @@
<data name=">>btnRetweet.Parent" xml:space="preserve">
<value>GroupBox1</value>
</data>
- <data name=">>lblAtSelf.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>Label29.Parent" xml:space="preserve">
+ <value>CooperatePanel</value>
</data>
<data name="Label61.Size" type="System.Drawing.Size, System.Drawing">
<value>62, 12</value>
@@ -3039,9 +3063,6 @@
<data name="chkGetFav.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="FavoritesTextCountApi.Size" type="System.Drawing.Size, System.Drawing">
- <value>58, 19</value>
- </data>
<data name=">>LabelUserStreamActive.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -3168,8 +3189,8 @@
<data name="PlaySnd.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
- <data name=">>CheckFollowEvent.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="StartAuthButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
<data name="CheckNicoms.ToolTip" xml:space="preserve">
<value />
@@ -3265,7 +3286,7 @@
<value>This is sample.</value>
</data>
<data name=">>PlaySnd.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>8</value>
</data>
<data name=">>ConnectionTimeOut.Parent" xml:space="preserve">
<value>ConnectionPanel</value>
@@ -3300,9 +3321,6 @@
<data name=">>Label41.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="CheckCloseToExit.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
<data name="CheckUseRecommendStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>195, 16</value>
</data>
@@ -3330,8 +3348,8 @@
<data name=">>lblAtTarget.Name" xml:space="preserve">
<value>lblAtTarget</value>
</data>
- <data name="CheckUnfavoritesEvent.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
+ <data name="Label31.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
</data>
<data name="Label60.Size" type="System.Drawing.Size, System.Drawing">
<value>99, 12</value>
@@ -3660,8 +3678,8 @@
<data name="ComboBoxPostKeySelect.Items1" xml:space="preserve">
<value>Ctrl+Enter</value>
</data>
- <data name="lblListFont.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
+ <data name="btnDetail.Location" type="System.Drawing.Point, System.Drawing">
+ <value>331, 146</value>
</data>
<data name=">>chkTabIconDisp.Parent" xml:space="preserve">
<value>PreviewPanel</value>
@@ -3699,8 +3717,8 @@
<data name="Label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name=">>Label43.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="btnDetail.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
<data name="Label12.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3891,8 +3909,8 @@
<data name=">>TimelinePeriod.Name" xml:space="preserve">
<value>TimelinePeriod</value>
</data>
- <data name=">>HotkeyCode.ZOrder" xml:space="preserve">
- <value>1</value>
+ <data name=">>Label16.Name" xml:space="preserve">
+ <value>Label16</value>
</data>
<data name=">>Label7.Parent" xml:space="preserve">
<value>GetPeriodPanel</value>
@@ -3904,7 +3922,7 @@
<value>6</value>
</data>
<data name="GroupBox3.Location" type="System.Drawing.Point, System.Drawing">
- <value>21, 313</value>
+ <value>21, 328</value>
</data>
<data name="ConnectionTimeOut.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Disable</value>
@@ -4321,7 +4339,7 @@
<value>NoControl</value>
</data>
<data name=">>TweetPrvPanel.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>1</value>
</data>
<data name=">>Label32.ZOrder" xml:space="preserve">
<value>6</value>
@@ -4434,8 +4452,8 @@
<data name="CheckBlockEvent.ToolTip" xml:space="preserve">
<value>チェックを不確定状態にすると他者が発生させたイベントのみ通知します</value>
</data>
- <data name="ComboBoxTranslateLanguage.Items62" xml:space="preserve">
- <value>Hungarian</value>
+ <data name="OpenPictureBuiltinBrowser.Text" xml:space="preserve">
+ <value>画像を内蔵ブラウザで開く</value>
</data>
<data name="StartAuthButton.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -4489,7 +4507,7 @@
<value>Listsの取得数</value>
</data>
<data name=">>Label38.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name=">>IsListsIncludeRtsCheckBox.ZOrder" xml:space="preserve">
<value>0</value>
@@ -4600,7 +4618,7 @@
<value>6</value>
</data>
<data name=">>CheckOpenUserTimeline.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="btnUnread.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 22</value>
@@ -4617,9 +4635,6 @@
<data name="Label16.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="ComboBoxTranslateLanguage.Items32" xml:space="preserve">
- <value>English (United States)</value>
- </data>
<data name="Label72.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -4725,8 +4740,8 @@
<data name="Label14.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 120</value>
</data>
- <data name="TweetActPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>518, 368</value>
+ <data name=">>CheckFollowEvent.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ChkNewMentionsBlink.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -4768,7 +4783,7 @@
<value>10</value>
</data>
<data name=">>UReadMng.ZOrder" xml:space="preserve">
- <value>11</value>
+ <value>12</value>
</data>
<data name=">>LabelProxyPassword.Parent" xml:space="preserve">
<value>ProxyPanel</value>
@@ -4869,6 +4884,9 @@
<data name="CheckMinimizeToTray.Text" xml:space="preserve">
<value>最小化したときにアイコン化する</value>
</data>
+ <data name=">>ProxyPanel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>PlaySnd.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -5036,6 +5054,9 @@
<data name="lblAtTarget.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
+ <data name="OneWayLv.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
<data name=">>Label53.Name" xml:space="preserve">
<value>Label53</value>
</data>
@@ -5067,7 +5088,7 @@
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Button3.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>7</value>
</data>
<data name="Label31.Text" xml:space="preserve">
<value>Twitter SearchAPI URL (search.twitter.com)</value>
@@ -5081,6 +5102,9 @@
<data name=">>Label46.Parent" xml:space="preserve">
<value>GetPeriodPanel</value>
</data>
+ <data name="OpenPictureBuiltinBrowser.TabIndex" type="System.Int32, mscorlib">
+ <value>16</value>
+ </data>
<data name=">>RadioProxyIE.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -5282,6 +5306,9 @@
<data name="ComboBoxEventNotifySound.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
+ <data name="btnDetailLink.TabIndex" type="System.Int32, mscorlib">
+ <value>20</value>
+ </data>
<data name="LabelPostAndGet.Size" type="System.Drawing.Size, System.Drawing">
<value>285, 12</value>
</data>
@@ -5297,8 +5324,8 @@
<data name=">>lblListFont.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="ComboBoxTranslateLanguage.Items3" xml:space="preserve">
- <value>Arabic (Iraq)</value>
+ <data name="OpenPictureBuiltinBrowser.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
<data name=">>StartupPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -5441,6 +5468,9 @@
<data name=">>Label10.Parent" xml:space="preserve">
<value>PreviewPanel</value>
</data>
+ <data name="btnAtTarget.ToolTip" xml:space="preserve">
+ <value />
+ </data>
<data name=">>Label76.Name" xml:space="preserve">
<value>Label76</value>
</data>
@@ -5466,7 +5496,7 @@
<value>NoControl</value>
</data>
<data name=">>Label15.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>10</value>
</data>
<data name="lblTarget.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 19</value>
@@ -5507,6 +5537,9 @@
<data name="Label10.ToolTip" xml:space="preserve">
<value />
</data>
+ <data name="lblInputBackcolor.ToolTip" xml:space="preserve">
+ <value />
+ </data>
<data name="AuthClearButton.Text" xml:space="preserve">
<value>削除</value>
</data>
@@ -5591,8 +5624,8 @@
<data name="Label52.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="Label49.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
+ <data name=">>AuthClearButton.Name" xml:space="preserve">
+ <value>AuthClearButton</value>
</data>
<data name=">>UReadMng.Name" xml:space="preserve">
<value>UReadMng</value>
@@ -5604,7 +5637,7 @@
<value>GroupBox1</value>
</data>
<data name="GroupBox3.Size" type="System.Drawing.Size, System.Drawing">
- <value>474, 41</value>
+ <value>474, 40</value>
</data>
<data name="ListDoubleClickActionComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>263, 277</value>
@@ -5864,11 +5897,11 @@
<data name=">>ProxyPanel.Parent" xml:space="preserve">
<value>SplitContainer1.Panel2</value>
</data>
- <data name="chkGetFav.TabIndex" type="System.Int32, mscorlib">
+ <data name=">>Label17.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <data name=">>BrowserPathText.Parent" xml:space="preserve">
- <value>ActionPanel</value>
+ <data name=">>Label59.Name" xml:space="preserve">
+ <value>Label59</value>
</data>
<data name="CheckMonospace.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -6091,8 +6124,8 @@
<data name="Label65.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name=">>Label67.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lblListFont.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
<data name=">>Label9.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -6257,7 +6290,7 @@
<value />
</data>
<data name=">>CheckReadOldPosts.ZOrder" xml:space="preserve">
- <value>15</value>
+ <value>16</value>
</data>
<data name=">>Label18.ZOrder" xml:space="preserve">
<value>6</value>
@@ -6436,9 +6469,6 @@
<data name=">>CheckMonospace.Parent" xml:space="preserve">
<value>PreviewPanel</value>
</data>
- <data name=">>btnDetailBack.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name="SplitContainer1.IsSplitterFixed" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -6610,8 +6640,8 @@
<data name="lblDetailBackcolor.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 19</value>
</data>
- <data name=">>CheckTinyURL.Name" xml:space="preserve">
- <value>CheckTinyURL</value>
+ <data name=">>BrowserPathText.Parent" xml:space="preserve">
+ <value>ActionPanel</value>
</data>
<data name=">>FavoritesTextCountApi.Name" xml:space="preserve">
<value>FavoritesTextCountApi</value>
@@ -6694,6 +6724,9 @@
<data name="HotkeyAlt.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
+ <data name="ComboBoxTranslateLanguage.Items3" xml:space="preserve">
+ <value>Arabic (Iraq)</value>
+ </data>
<data name="Label11.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 152</value>
</data>
@@ -6721,11 +6754,11 @@
<data name=">>GetPeriodPanel.Parent" xml:space="preserve">
<value>SplitContainer1.Panel2</value>
</data>
- <data name="btnAtTarget.ToolTip" xml:space="preserve">
- <value />
+ <data name="OpenPictureBuiltinBrowser.Size" type="System.Drawing.Size, System.Drawing">
+ <value>145, 16</value>
</data>
<data name=">>CheckMinimizeToTray.ZOrder" xml:space="preserve">
- <value>14</value>
+ <value>15</value>
</data>
<data name=">>TextProxyPort.Parent" xml:space="preserve">
<value>ProxyPanel</value>
@@ -6933,7 +6966,7 @@
<value>7</value>
</data>
<data name=">>BrowserPathText.ZOrder" xml:space="preserve">
- <value>10</value>
+ <value>11</value>
</data>
<data name="CheckOutputz.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@@ -6948,7 +6981,7 @@
<value>タイムライン更新間隔（秒）</value>
</data>
<data name=">>GroupBox3.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="Label32.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 70</value>
@@ -6980,14 +7013,14 @@
<data name="lblFav.Text" xml:space="preserve">
<value>This is sample.</value>
</data>
- <data name=">>Label60.ZOrder" xml:space="preserve">
- <value>9</value>
+ <data name="CheckFavoritesEvent.ToolTip" xml:space="preserve">
+ <value>チェックを不確定状態にすると他者が発生させたイベントのみ通知します</value>
</data>
- <data name="lblListBackcolor.Size" type="System.Drawing.Size, System.Drawing">
- <value>102, 19</value>
+ <data name="FavoritesTextCountApi.Size" type="System.Drawing.Size, System.Drawing">
+ <value>58, 19</value>
</data>
- <data name="OneWayLv.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
+ <data name=">>OpenPictureBuiltinBrowser.Parent" xml:space="preserve">
+ <value>ActionPanel</value>
</data>
<data name=">>CheckListMemberRemovedEvent.Parent" xml:space="preserve">
<value>NotifyPanel</value>
@@ -7031,8 +7064,8 @@
<data name="Label57.Size" type="System.Drawing.Size, System.Drawing">
<value>340, 12</value>
</data>
- <data name="btnDetail.Location" type="System.Drawing.Point, System.Drawing">
- <value>331, 146</value>
+ <data name=">>CheckAtIdSupple.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
<data name="CheckMonospace.Text" xml:space="preserve">
<value>発言詳細を等幅フォントで表示（AA対応、フォント適用不具合あり）</value>
@@ -7226,8 +7259,8 @@
<data name=">>CheckListMemberAddedEvent.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>DMPeriod.Name" xml:space="preserve">
- <value>DMPeriod</value>
+ <data name="lblDetail.TabIndex" type="System.Int32, mscorlib">
+ <value>16</value>
</data>
<data name="Label62.Location" type="System.Drawing.Point, System.Drawing">
<value>217, 134</value>
@@ -7416,7 +7449,7 @@
<value>182, 19</value>
</data>
<data name=">>CheckCloseToExit.ZOrder" xml:space="preserve">
- <value>13</value>
+ <value>14</value>
</data>
<data name=">>ButtonBackToDefaultFontColor2.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -7533,7 +7566,7 @@
<value>14</value>
</data>
<data name=">>BasedPanel.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>2</value>
</data>
<data name="FollowCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 16</value>
@@ -7568,8 +7601,8 @@
<data name="CheckUseSsl.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 78</value>
</data>
- <data name="lblInputBackcolor.ToolTip" xml:space="preserve">
- <value />
+ <data name="CheckFavEventUnread.Size" type="System.Drawing.Size, System.Drawing">
+ <value>271, 16</value>
</data>
<data name=">>UserTimelineTextCountApi.Parent" xml:space="preserve">
<value>GetCountPanel</value>
@@ -7634,8 +7667,8 @@
<data name="Label69.ToolTip" xml:space="preserve">
<value />
</data>
- <data name="CheckFavoritesEvent.ToolTip" xml:space="preserve">
- <value>チェックを不確定状態にすると他者が発生させたイベントのみ通知します</value>
+ <data name=">>OpenPictureBuiltinBrowser.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
<data name="CheckMinimizeToTray.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -7643,6 +7676,9 @@
<data name="CheckDispUsername.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
+ <data name=">>OpenPictureBuiltinBrowser.Name" xml:space="preserve">
+ <value>OpenPictureBuiltinBrowser</value>
+ </data>
<data name="TextCountApiReply.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 19</value>
</data>
@@ -7823,8 +7859,8 @@
<data name=">>Label19.Parent" xml:space="preserve">
<value>GetCountPanel</value>
</data>
- <data name=">>ProxyPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>OpenPictureBuiltinBrowser.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Label18.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -7859,9 +7895,6 @@
<data name="Label62.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>CheckAtIdSupple.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
<data name="CheckUseSsl.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
@@ -7883,7 +7916,7 @@
<data name="HideDuplicatedRetweetsCheck.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 16</value>
</data>
- <data name="Label13.ToolTip" xml:space="preserve">
+ <data name="CheckShowGrid.ToolTip" xml:space="preserve">
<value />
</data>
<data name="UserTimelinePeriod.Location" type="System.Drawing.Point, System.Drawing">
@@ -8042,8 +8075,8 @@
<data name=">>Label67.Name" xml:space="preserve">
<value>Label67</value>
</data>
- <data name="CheckShowGrid.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>Label60.ZOrder" xml:space="preserve">
+ <value>9</value>
</data>
<data name="Label72.ToolTip" xml:space="preserve">
<value />
@@ -8120,9 +8153,6 @@
<data name="ComboDispTitle.Items6" xml:space="preserve">
<value>全未読/全発言数</value>
</data>
- <data name="CmbDateTimeFormat.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
<data name="CheckRetweetNoConfirm.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -8387,8 +8417,8 @@
<data name="CheckDispUsername.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 43</value>
</data>
- <data name="CheckStartupVersion.Text" xml:space="preserve">
- <value>最新版のチェックをする</value>
+ <data name="CmbDateTimeFormat.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
</data>
<data name="ComboBoxTranslateLanguage.Items8" xml:space="preserve">
<value>Arabic (Tunisia)</value>
@@ -8501,8 +8531,8 @@
<data name="ComboBoxTranslateLanguage.Items31" xml:space="preserve">
<value>English</value>
</data>
- <data name="Label31.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
+ <data name="ComboBoxTranslateLanguage.Items32" xml:space="preserve">
+ <value>English (United States)</value>
</data>
<data name="CheckShowGrid.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -8558,8 +8588,8 @@
<data name=">>Label63.ZOrder" xml:space="preserve">
<value>7</value>
</data>
- <data name=">>TextBox3.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>lblAtSelf.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>SplitContainer1.Type" xml:space="preserve">
<value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -8567,9 +8597,12 @@
<data name=">>TextBox3.Name" xml:space="preserve">
<value>TextBox3</value>
</data>
- <data name=">>FontDialog1.Type" xml:space="preserve">
- <value>System.Windows.Forms.FontDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="CheckStartupVersion.Text" xml:space="preserve">
+ <value>最新版のチェックをする</value>
</data>
+ <data name="Label13.ToolTip" xml:space="preserve">
+ <value />
+ </data>
<data name="IconSize.Location" type="System.Drawing.Point, System.Drawing">
<value>252, 149</value>
</data>
Modified: trunk/Tween/AppendSettingDialog.vb
===================================================================
--- trunk/Tween/AppendSettingDialog.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/AppendSettingDialog.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -149,6 +149,8 @@
Public Property FoursquarePreviewZoom As Integer
Public Property IsListStatusesIncludeRts As Boolean
Public Property UserAccounts As List(Of UserAccount)
+ Private InitialUserId As Long
+ Public Property OpenPicBuiltinBrowser As Boolean
Public Property TwitterConfiguration As New TwitterDataModel.Configuration
@@ -481,6 +483,7 @@
Me.FoursquarePreviewWidth = CInt(Me.FoursquarePreviewWidthTextBox.Text)
Me.FoursquarePreviewZoom = CInt(Me.FoursquarePreviewZoomTextBox.Text)
Me.IsListStatusesIncludeRts = Me.IsListsIncludeRtsCheckBox.Checked
+ Me.OpenPicBuiltinBrowser = Me.OpenPictureBuiltinBrowser.Checked
Catch ex As Exception
MessageBox.Show(My.Resources.Save_ClickText3)
Me.DialogResult = Windows.Forms.DialogResult.Cancel
@@ -489,6 +492,27 @@
End Sub
Private Sub Setting_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
+ If _endingFlag Then Exit Sub
+
+ Me.UserAccounts.Clear()
+ For Each u In Me.AuthUserCombo.Items
+ Me.UserAccounts.Add(DirectCast(u, UserAccount))
+ Next
+ Dim userSet As Boolean = False
+ For Each u In Me.UserAccounts
+ If u.UserId = Me.InitialUserId Then
+ tw.Initialize(u.Token, u.TokenSecret, u.Username, u.UserId)
+ Google.GASender.GetInstance.SessionFirst = u.GAFirst
+ Google.GASender.GetInstance.SessionLast = u.GALast
+ userSet = True
+ Exit For
+ End If
+ Next
+ If Not userSet Then
+ tw.ClearAuthInfo()
+ tw.Initialize("", "", "", 0)
+ End If
+
If tw IsNot Nothing AndAlso tw.Username = "" AndAlso e.CloseReason = CloseReason.None Then
If MessageBox.Show(My.Resources.Setting_FormClosing1, "Confirm", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Cancel Then
e.Cancel = True
@@ -539,6 +563,7 @@
For Each u In Me.UserAccounts
If u.UserId = tw.UserId Then
Me.AuthUserCombo.SelectedItem = u
+ Me.InitialUserId = u.UserId
Exit For
End If
Next
@@ -780,6 +805,7 @@
Me.FoursquarePreviewWidthTextBox.Text = Me.FoursquarePreviewWidth.ToString
Me.FoursquarePreviewZoomTextBox.Text = Me.FoursquarePreviewZoom.ToString
Me.IsListsIncludeRtsCheckBox.Checked = Me.IsListStatusesIncludeRts
+ Me.OpenPictureBuiltinBrowser.Checked = Me.OpenPicBuiltinBrowser
With Me.TreeViewSetting
.Nodes("BasedNode").Tag = BasedPanel
@@ -2255,6 +2281,7 @@
Dim rslt As String = tw.StartAuthentication(pinPageUrl)
If String.IsNullOrEmpty(rslt) Then
Using ab = New AuthBrowser
+ ab.Auth = True
ab.UrlString = pinPageUrl
If ab.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then
Me._pin = ab.PinString
Modified: trunk/Tween/AuthBrowser.Designer.vb
===================================================================
--- trunk/Tween/AuthBrowser.Designer.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/AuthBrowser.Designer.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -26,9 +26,10 @@
Me.AddressLabel = New System.Windows.Forms.Label()
Me.AuthWebBrowser = New System.Windows.Forms.WebBrowser()
Me.Panel2 = New System.Windows.Forms.Panel()
- Me.NextButton = New System.Windows.Forms.Button()
+ Me.Cancel = New System.Windows.Forms.Button()
Me.Label1 = New System.Windows.Forms.Label()
Me.PinText = New System.Windows.Forms.TextBox()
+ Me.NextButton = New System.Windows.Forms.Button()
Me.Panel2.SuspendLayout()
Me.SuspendLayout()
'
@@ -62,6 +63,7 @@
'
'Panel2
'
+ Me.Panel2.Controls.Add(Me.Cancel)
Me.Panel2.Controls.Add(Me.AddressLabel)
Me.Panel2.Controls.Add(Me.Label1)
Me.Panel2.Controls.Add(Me.PinText)
@@ -72,15 +74,16 @@
Me.Panel2.Size = New System.Drawing.Size(773, 22)
Me.Panel2.TabIndex = 2
'
- 'NextButton
+ 'Cancel
'
- Me.NextButton.Dock = System.Windows.Forms.DockStyle.Right
- Me.NextButton.Location = New System.Drawing.Point(698, 0)
- Me.NextButton.Name = "NextButton"
- Me.NextButton.Size = New System.Drawing.Size(75, 22)
- Me.NextButton.TabIndex = 2
- Me.NextButton.Text = "Finish"
- Me.NextButton.UseVisualStyleBackColor = True
+ Me.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.Cancel.Location = New System.Drawing.Point(536, 32)
+ Me.Cancel.Name = "Cancel"
+ Me.Cancel.Size = New System.Drawing.Size(75, 15)
+ Me.Cancel.TabIndex = 3
+ Me.Cancel.TabStop = False
+ Me.Cancel.Text = "Cancel"
+ Me.Cancel.UseVisualStyleBackColor = True
'
'Label1
'
@@ -101,11 +104,22 @@
Me.PinText.Size = New System.Drawing.Size(138, 19)
Me.PinText.TabIndex = 1
'
+ 'NextButton
+ '
+ Me.NextButton.Dock = System.Windows.Forms.DockStyle.Right
+ Me.NextButton.Location = New System.Drawing.Point(698, 0)
+ Me.NextButton.Name = "NextButton"
+ Me.NextButton.Size = New System.Drawing.Size(75, 22)
+ Me.NextButton.TabIndex = 2
+ Me.NextButton.Text = "Finish"
+ Me.NextButton.UseVisualStyleBackColor = True
+ '
'AuthBrowser
'
Me.AcceptButton = Me.NextButton
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.Cancel
Me.ClientSize = New System.Drawing.Size(773, 562)
Me.Controls.Add(Me.AuthWebBrowser)
Me.Controls.Add(Me.Panel1)
@@ -114,7 +128,7 @@
Me.MinimizeBox = False
Me.Name = "AuthBrowser"
Me.ShowIcon = False
- Me.Text = "AuthBrowser"
+ Me.Text = "Browser"
Me.Panel2.ResumeLayout(False)
Me.Panel2.PerformLayout()
Me.ResumeLayout(False)
@@ -128,4 +142,5 @@
Friend WithEvents NextButton As System.Windows.Forms.Button
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents PinText As System.Windows.Forms.TextBox
+ Friend WithEvents Cancel As System.Windows.Forms.Button
End Class
Modified: trunk/Tween/AuthBrowser.vb
===================================================================
--- trunk/Tween/AuthBrowser.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/AuthBrowser.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -3,6 +3,7 @@
Public Class AuthBrowser
Public Property UrlString As String
Public Property PinString As String
+ Public Property Auth As Boolean = True
Private Sub AuthWebBrowser_DocumentCompleted(ByVal sender As System.Object, ByVal e As System.Windows.Forms.WebBrowserDocumentCompletedEventArgs) Handles AuthWebBrowser.DocumentCompleted
If Me.AuthWebBrowser.Url.OriginalString = "https://api.twitter.com/oauth/authorize" Then
@@ -18,6 +19,10 @@
Private Sub AuthBrowser_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Me.AuthWebBrowser.Navigate(New Uri(UrlString))
+ If Not Auth Then
+ Me.Label1.Visible = False
+ Me.PinText.Visible = False
+ End If
End Sub
Private Sub AuthWebBrowser_Navigating(ByVal sender As System.Object, ByVal e As System.Windows.Forms.WebBrowserNavigatingEventArgs) Handles AuthWebBrowser.Navigating
@@ -28,4 +33,9 @@
PinString = PinText.Text.Trim
Me.DialogResult = Windows.Forms.DialogResult.OK
End Sub
+
+ Private Sub Cancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel.Click
+ PinString = ""
+ Me.DialogResult = Windows.Forms.DialogResult.Cancel
+ End Sub
End Class
\ No newline at end of file
Modified: trunk/Tween/DialogAsShieldIcon.vb
===================================================================
--- trunk/Tween/DialogAsShieldIcon.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/DialogAsShieldIcon.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -52,7 +52,7 @@
PictureBox1.Image = System.Drawing.SystemIcons.Question.ToBitmap()
End Sub
- Public Shadows Function Show(ByVal text As String, Optional ByVal detail As String = "", Optional ByVal caption As String = "DialogAsShieldIcon", _
+ Public Shadows Function ShowDialog(ByVal text As String, Optional ByVal detail As String = "", Optional ByVal caption As String = "DialogAsShieldIcon", _
Optional ByVal Buttons As Windows.Forms.MessageBoxButtons = MessageBoxButtons.OKCancel, _
Optional ByVal icon As Windows.Forms.MessageBoxIcon = MessageBoxIcon.Question _
) As System.Windows.Forms.DialogResult
@@ -72,7 +72,7 @@
End Select
' とりあえずアイコンは処理しない（互換性のためパラメータだけ指定できる）
- MyBase.Show()
+ MyBase.ShowDialog(Me.Owner)
Do While Me.dResult = Windows.Forms.DialogResult.None
System.Threading.Thread.Sleep(200)
Application.DoEvents()
Modified: trunk/Tween/Setting/SettingCommon.vb
===================================================================
--- trunk/Tween/Setting/SettingCommon.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/Setting/SettingCommon.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -202,6 +202,7 @@
Public IsListsIncludeRts As Boolean = False
Public GAFirst As Long = 0
Public GALast As Long = 0
+ Public OpenPicBuiltinBrowser As Boolean = False
End Class
Public Class UserAccount
Modified: trunk/Tween/Thumbnail.vb
===================================================================
--- trunk/Tween/Thumbnail.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/Thumbnail.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -361,7 +361,15 @@
Public Sub OpenPicture()
If _prev IsNot Nothing Then
If Owner.PreviewScrollBar.Value < _prev.pics.Count Then
- Owner.OpenUriAsync(_prev.pics(Owner.PreviewScrollBar.Value).Key)
+ If AppendSettingDialog.Instance.OpenPicBuiltinBrowser Then
+ Using ab As New AuthBrowser
+ ab.Auth = False
+ ab.UrlString = _prev.pics(Owner.PreviewScrollBar.Value).Key
+ ab.ShowDialog(Owner)
+ End Using
+ Else
+ Owner.OpenUriAsync(_prev.pics(Owner.PreviewScrollBar.Value).Key)
+ End If
End If
End If
End Sub
@@ -633,7 +641,19 @@
''' <remarks></remarks>
Private Function Plixi_CreateImage(ByVal args As CreateImageArgs) As Boolean
' TODO: サムネイル画像読み込み処理を記述します
- Dim img As Image = (New HttpVarious).GetImage(args.url.Value, args.url.Key, 10000, args.errmsg)
+ Dim referer As String = ""
+ If args.url.Key.Contains("t.co") Then
+ If args.url.Value.Contains("tweetphoto.com") Then
+ referer = "http://tweetphoto.com"
+ ElseIf args.url.Value.Contains("http://lockerz.com") Then
+ referer = "http://lockerz.com"
+ Else
+ referer = "http://plixi.com"
+ End If
+ Else
+ referer = args.url.Key
+ End If
+ Dim img As Image = (New HttpVarious).GetImage(args.url.Value, referer, 10000, args.errmsg)
If img Is Nothing Then
Return False
End If
Modified: trunk/Tween/Tween.vb
===================================================================
--- trunk/Tween/Tween.vb 2011-09-22 01:12:43 UTC (rev 1599)
+++ trunk/Tween/Tween.vb 2011-09-26 04:08:06 UTC (rev 1600)
@@ -797,6 +797,7 @@
SettingDialog.FoursquarePreviewWidth = _cfgCommon.FoursquarePreviewWidth
SettingDialog.FoursquarePreviewZoom = _cfgCommon.FoursquarePreviewZoom
SettingDialog.IsListStatusesIncludeRts = _cfgCommon.IsListsIncludeRts
+ SettingDialog.OpenPicBuiltinBrowser = _cfgCommon.OpenPicBuiltinBrowser
'ハッシュタグ関連
HashSupl = New AtIdSupplement(_cfgCommon.HashTags, "#")
@@ -4869,7 +4870,7 @@
If fileVersion <> "" AndAlso strVer.CompareTo(fileVersion.Replace(".", "")) > 0 Then
Dim tmp As String = String.Format(My.Resources.CheckNewVersionText3, strVer)
Using dialogAsShieldicon As New DialogAsShieldIcon
- If dialogAsShieldicon.Show(tmp, strDetail, My.Resources.CheckNewVersionText1, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Yes Then
+ If dialogAsShieldicon.ShowDialog(tmp, strDetail, My.Resources.CheckNewVersionText1, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Yes Then
retMsg = tw.GetTweenBinary(strVer)
If retMsg.Length = 0 Then
RunTweenUp()
@@ -4887,7 +4888,7 @@
If forceUpdate Then
Dim tmp As String = String.Format(My.Resources.CheckNewVersionText6, strVer)
Using dialogAsShieldicon As New DialogAsShieldIcon
- If dialogAsShieldicon.Show(tmp, strDetail, My.Resources.CheckNewVersionText1, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Yes Then
+ If dialogAsShieldicon.ShowDialog(tmp, strDetail, My.Resources.CheckNewVersionText1, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Yes Then
retMsg = tw.GetTweenBinary(strVer)
If retMsg.Length = 0 Then
RunTweenUp()
@@ -6371,6 +6372,7 @@
_cfgCommon.IsListsIncludeRts = SettingDialog.IsListStatusesIncludeRts
_cfgCommon.GAFirst = Google.GASender.GetInstance.SessionFirst
_cfgCommon.GALast = Google.GASender.GetInstance.SessionLast
+ _cfgCommon.OpenPicBuiltinBrowser = SettingDialog.OpenPicBuiltinBrowser
_cfgCommon.Save()
End SyncLock
@@ -8358,7 +8360,17 @@
Private Sub UrlCopyContextMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles UrlCopyContextMenuItem.Click
Try
- Clipboard.SetDataObject(Me._postBrowserStatusText, False, 5, 100)
+ Dim mc As MatchCollection = Regex.Matches(Me.PostBrowser.DocumentText, "<a[^>]*href=""(?<url>" + Me._postBrowserStatusText.Replace(".", "\.") + ")""[^>]*title=""(?<title>https?://[^""]+)""", RegexOptions.IgnoreCase)
+ For Each m As Match In mc
+ If m.Groups("url").Value = Me._postBrowserStatusText Then
+ Clipboard.SetDataObject(m.Groups("title").Value, False, 5, 100)
+ Exit For
+ End If
+ Next
+ If mc.Count = 0 Then
+ Clipboard.SetDataObject(Me._postBrowserStatusText, False, 5, 100)
+ End If
+ 'Clipboard.SetDataObject(Me._postBrowserStatusText, False, 5, 100)
Catch ex As Exception
MessageBox.Show(ex.Message)
End Try