svnno****@sourc*****
svnno****@sourc*****
2010年 11月 14日 (日) 19:36:29 JST
Revision: 1069
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1069
Author: syo68k
Date: 2010-11-14 19:36:28 +0900 (Sun, 14 Nov 2010)
Log Message:
-----------
Protect発言をRT/STOTコピー許可するかの設定を廃止し公式RTの際に確認しない設定を追加
Modified Paths:
--------------
trunk/Tween/Setting/SettingCommon.vb
trunk/Tween/Setting.Designer.vb
trunk/Tween/Setting.resx
trunk/Tween/Setting.vb
trunk/Tween/Tween.vb
-------------- next part --------------
Modified: trunk/Tween/Setting/SettingCommon.vb
===================================================================
--- trunk/Tween/Setting/SettingCommon.vb 2010-11-14 10:19:30 UTC (rev 1068)
+++ trunk/Tween/Setting/SettingCommon.vb 2010-11-14 10:36:28 UTC (rev 1069)
@@ -145,6 +145,7 @@
Public DateTimeFormat As String = "yyyy/MM/dd H:mm:ss"
Public DefaultTimeOut As Integer = 20
'Public ProtectNotInclude As Boolean = True
+ Public RetweetNoConfirm As Boolean = False
Public LimitBalloon As Boolean = False
Public TabIconDisp As Boolean = True
Public ReplyIconState As REPLY_ICONSTATE = REPLY_ICONSTATE.StaticIcon
Modified: trunk/Tween/Setting.Designer.vb
===================================================================
--- trunk/Tween/Setting.Designer.vb 2010-11-14 10:19:30 UTC (rev 1068)
+++ trunk/Tween/Setting.Designer.vb 2010-11-14 10:36:28 UTC (rev 1069)
@@ -174,8 +174,6 @@
Me.Label76 = New System.Windows.Forms.Label()
Me.ComboBoxAutoShortUrlFirst = New System.Windows.Forms.ComboBox()
Me.Label71 = New System.Windows.Forms.Label()
- Me.CheckProtectNotInclude = New System.Windows.Forms.CheckBox()
- Me.Label42 = New System.Windows.Forms.Label()
Me.CheckAutoConvertUrl = New System.Windows.Forms.CheckBox()
Me.Label29 = New System.Windows.Forms.Label()
Me.Label57 = New System.Windows.Forms.Label()
@@ -237,6 +235,7 @@
Me.RadioProxyIE = New System.Windows.Forms.RadioButton()
Me.RadioProxyNone = New System.Windows.Forms.RadioButton()
Me.TabPage6 = New System.Windows.Forms.TabPage()
+ Me.FavoritesTextCountApi = New System.Windows.Forms.TextBox()
Me.SearchTextCountApi = New System.Windows.Forms.TextBox()
Me.Label66 = New System.Windows.Forms.Label()
Me.FirstTextCountApi = New System.Windows.Forms.TextBox()
@@ -249,7 +248,8 @@
Me.Label59 = New System.Windows.Forms.Label()
Me.TextBoxOutputzKey = New System.Windows.Forms.TextBox()
Me.CheckOutputz = New System.Windows.Forms.CheckBox()
- Me.FavoritesTextCountApi = New System.Windows.Forms.TextBox()
+ Me.Label42 = New System.Windows.Forms.Label()
+ Me.CheckRetweetNoConfirm = New System.Windows.Forms.CheckBox()
Me.GroupBox1.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -1088,6 +1088,8 @@
'
'TabPage2
'
+ Me.TabPage2.Controls.Add(Me.CheckRetweetNoConfirm)
+ Me.TabPage2.Controls.Add(Me.Label42)
Me.TabPage2.Controls.Add(Me.GroupBox3)
Me.TabPage2.Controls.Add(Me.Label82)
Me.TabPage2.Controls.Add(Me.CheckHashSupple)
@@ -1099,8 +1101,6 @@
Me.TabPage2.Controls.Add(Me.Label76)
Me.TabPage2.Controls.Add(Me.ComboBoxAutoShortUrlFirst)
Me.TabPage2.Controls.Add(Me.Label71)
- Me.TabPage2.Controls.Add(Me.CheckProtectNotInclude)
- Me.TabPage2.Controls.Add(Me.Label42)
Me.TabPage2.Controls.Add(Me.CheckAutoConvertUrl)
Me.TabPage2.Controls.Add(Me.Label29)
Me.TabPage2.Controls.Add(Me.Label57)
@@ -1241,17 +1241,6 @@
resources.ApplyResources(Me.Label71, "Label71")
Me.Label71.Name = "Label71"
'
- 'CheckProtectNotInclude
- '
- resources.ApplyResources(Me.CheckProtectNotInclude, "CheckProtectNotInclude")
- Me.CheckProtectNotInclude.Name = "CheckProtectNotInclude"
- Me.CheckProtectNotInclude.UseVisualStyleBackColor = True
- '
- 'Label42
- '
- resources.ApplyResources(Me.Label42, "Label42")
- Me.Label42.Name = "Label42"
- '
'CheckAutoConvertUrl
'
resources.ApplyResources(Me.CheckAutoConvertUrl, "CheckAutoConvertUrl")
@@ -1677,6 +1666,11 @@
Me.TabPage6.Name = "TabPage6"
Me.TabPage6.UseVisualStyleBackColor = True
'
+ 'FavoritesTextCountApi
+ '
+ resources.ApplyResources(Me.FavoritesTextCountApi, "FavoritesTextCountApi")
+ Me.FavoritesTextCountApi.Name = "FavoritesTextCountApi"
+ '
'SearchTextCountApi
'
resources.ApplyResources(Me.SearchTextCountApi, "SearchTextCountApi")
@@ -1743,11 +1737,17 @@
Me.CheckOutputz.Name = "CheckOutputz"
Me.CheckOutputz.UseVisualStyleBackColor = True
'
- 'FavoritesTextCountApi
+ 'Label42
'
- resources.ApplyResources(Me.FavoritesTextCountApi, "FavoritesTextCountApi")
- Me.FavoritesTextCountApi.Name = "FavoritesTextCountApi"
+ resources.ApplyResources(Me.Label42, "Label42")
+ Me.Label42.Name = "Label42"
'
+ 'CheckRetweetNoConfirm
+ '
+ resources.ApplyResources(Me.CheckRetweetNoConfirm, "CheckRetweetNoConfirm")
+ Me.CheckRetweetNoConfirm.Name = "CheckRetweetNoConfirm"
+ Me.CheckRetweetNoConfirm.UseVisualStyleBackColor = True
+ '
'Setting
'
Me.AcceptButton = Me.Save
@@ -1917,8 +1917,6 @@
Friend WithEvents Label63 As System.Windows.Forms.Label
Friend WithEvents Label64 As System.Windows.Forms.Label
Friend WithEvents ConnectionTimeOut As System.Windows.Forms.TextBox
- Friend WithEvents CheckProtectNotInclude As System.Windows.Forms.CheckBox
- Friend WithEvents Label42 As System.Windows.Forms.Label
Friend WithEvents btnInputBackcolor As System.Windows.Forms.Button
Friend WithEvents lblInputBackcolor As System.Windows.Forms.Label
Friend WithEvents Label52 As System.Windows.Forms.Label
@@ -2010,4 +2008,6 @@
Friend WithEvents SearchTextCountApi As System.Windows.Forms.TextBox
Friend WithEvents Label66 As System.Windows.Forms.Label
Friend WithEvents FavoritesTextCountApi As System.Windows.Forms.TextBox
+ Friend WithEvents CheckRetweetNoConfirm As System.Windows.Forms.CheckBox
+ Friend WithEvents Label42 As System.Windows.Forms.Label
End Class
Modified: trunk/Tween/Setting.resx
===================================================================
--- trunk/Tween/Setting.resx 2010-11-14 10:19:30 UTC (rev 1068)
+++ trunk/Tween/Setting.resx 2010-11-14 10:36:28 UTC (rev 1069)
@@ -3660,6 +3660,60 @@
<data name=">>TabPage1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="CheckRetweetNoConfirm.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="CheckRetweetNoConfirm.Location" type="System.Drawing.Point, System.Drawing">
+ <value>173, 259</value>
+ </data>
+ <data name="CheckRetweetNoConfirm.Size" type="System.Drawing.Size, System.Drawing">
+ <value>92, 16</value>
+ </data>
+ <data name="CheckRetweetNoConfirm.TabIndex" type="System.Int32, mscorlib">
+ <value>40</value>
+ </data>
+ <data name="CheckRetweetNoConfirm.Text" xml:space="preserve">
+ <value>RT確認しない</value>
+ </data>
+ <data name=">>CheckRetweetNoConfirm.Name" xml:space="preserve">
+ <value>CheckRetweetNoConfirm</value>
+ </data>
+ <data name=">>CheckRetweetNoConfirm.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>CheckRetweetNoConfirm.Parent" xml:space="preserve">
+ <value>TabPage2</value>
+ </data>
+ <data name=">>CheckRetweetNoConfirm.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="Label42.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="Label42.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 260</value>
+ </data>
+ <data name="Label42.Size" type="System.Drawing.Size, System.Drawing">
+ <value>44, 12</value>
+ </data>
+ <data name="Label42.TabIndex" type="System.Int32, mscorlib">
+ <value>39</value>
+ </data>
+ <data name="Label42.Text" xml:space="preserve">
+ <value>公式RT</value>
+ </data>
+ <data name=">>Label42.Name" xml:space="preserve">
+ <value>Label42</value>
+ </data>
+ <data name=">>Label42.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>Label42.Parent" xml:space="preserve">
+ <value>TabPage2</value>
+ </data>
+ <data name=">>Label42.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="HotkeyCheck.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -3880,7 +3934,7 @@
<value>TabPage2</value>
</data>
<data name=">>GroupBox3.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>2</value>
</data>
<data name="Label82.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3910,7 +3964,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label82.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>3</value>
</data>
<data name="CheckHashSupple.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3940,7 +3994,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckHashSupple.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>4</value>
</data>
<data name="Label79.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3970,7 +4024,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label79.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>5</value>
</data>
<data name="CheckAtIdSupple.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4000,7 +4054,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckAtIdSupple.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>6</value>
</data>
<data name="TextBitlyPw.Location" type="System.Drawing.Point, System.Drawing">
<value>318, 213</value>
@@ -4021,7 +4075,7 @@
<value>TabPage2</value>
</data>
<data name=">>TextBitlyPw.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>7</value>
</data>
<data name="Label77.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4048,7 +4102,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label77.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>8</value>
</data>
<data name="TextBitlyId.Location" type="System.Drawing.Point, System.Drawing">
<value>194, 213</value>
@@ -4069,7 +4123,7 @@
<value>TabPage2</value>
</data>
<data name=">>TextBitlyId.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>9</value>
</data>
<data name="Label76.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4096,7 +4150,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label76.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>10</value>
</data>
<data name="ComboBoxAutoShortUrlFirst.Items" xml:space="preserve">
<value>tinyurl</value>
@@ -4132,7 +4186,7 @@
<value>TabPage2</value>
</data>
<data name=">>ComboBoxAutoShortUrlFirst.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>11</value>
</data>
<data name="Label71.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4162,60 +4216,6 @@
<value>TabPage2</value>
</data>
<data name=">>Label71.ZOrder" xml:space="preserve">
- <value>10</value>
- </data>
- <data name="CheckProtectNotInclude.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="CheckProtectNotInclude.Location" type="System.Drawing.Point, System.Drawing">
- <value>173, 261</value>
- </data>
- <data name="CheckProtectNotInclude.Size" type="System.Drawing.Size, System.Drawing">
- <value>136, 16</value>
- </data>
- <data name="CheckProtectNotInclude.TabIndex" type="System.Int32, mscorlib">
- <value>24</value>
- </data>
- <data name="CheckProtectNotInclude.Text" xml:space="preserve">
- <value>Protect発言を含めない</value>
- </data>
- <data name=">>CheckProtectNotInclude.Name" xml:space="preserve">
- <value>CheckProtectNotInclude</value>
- </data>
- <data name=">>CheckProtectNotInclude.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>CheckProtectNotInclude.Parent" xml:space="preserve">
- <value>TabPage2</value>
- </data>
- <data name=">>CheckProtectNotInclude.ZOrder" xml:space="preserve">
- <value>11</value>
- </data>
- <data name="Label42.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="Label42.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 262</value>
- </data>
- <data name="Label42.Size" type="System.Drawing.Size, System.Drawing">
- <value>114, 12</value>
- </data>
- <data name="Label42.TabIndex" type="System.Int32, mscorlib">
- <value>23</value>
- </data>
- <data name="Label42.Text" xml:space="preserve">
- <value>STOTコピーとReTweet</value>
- </data>
- <data name=">>Label42.Name" xml:space="preserve">
- <value>Label42</value>
- </data>
- <data name=">>Label42.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>Label42.Parent" xml:space="preserve">
- <value>TabPage2</value>
- </data>
- <data name=">>Label42.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="CheckAutoConvertUrl.AutoSize" type="System.Boolean, mscorlib">
Modified: trunk/Tween/Setting.vb
===================================================================
--- trunk/Tween/Setting.vb 2010-11-14 10:19:30 UTC (rev 1068)
+++ trunk/Tween/Setting.vb 2010-11-14 10:36:28 UTC (rev 1069)
@@ -123,6 +123,7 @@
Private _MyUseAdditonalCount As Boolean
Private _SearchCountApi As Integer
Private _FavoritesCountApi As Integer
+ Private _MyRetweetNoConfirm As Boolean
Private _ValidationError As Boolean = False
@@ -262,6 +263,7 @@
_MyDateTimeFormat = CmbDateTimeFormat.Text
_MyDefaultTimeOut = CType(ConnectionTimeOut.Text, Integer)
'_MyProtectNotInclude = CheckProtectNotInclude.Checked
+ _MyRetweetNoConfirm = CheckRetweetNoConfirm.Checked
_MyLimitBalloon = CheckBalloonLimit.Checked
_MyAutoShortUrlFirst = CType(ComboBoxAutoShortUrlFirst.SelectedIndex, UrlConverter)
_MyTabIconDisp = chkTabIconDisp.Checked
@@ -500,6 +502,7 @@
CmbDateTimeFormat.Text = _MyDateTimeFormat
ConnectionTimeOut.Text = _MyDefaultTimeOut.ToString
'CheckProtectNotInclude.Checked = _MyProtectNotInclude
+ CheckRetweetNoConfirm.Checked = _MyRetweetNoConfirm
CheckBalloonLimit.Checked = _MyLimitBalloon
ComboBoxAutoShortUrlFirst.SelectedIndex = _MyAutoShortUrlFirst
chkTabIconDisp.Checked = _MyTabIconDisp
@@ -1433,6 +1436,15 @@
' End Set
'End Property
+ Public Property RetweetNoConfirm() As Boolean
+ Get
+ Return _MyRetweetNoConfirm
+ End Get
+ Set(ByVal value As Boolean)
+ _MyRetweetNoConfirm = value
+ End Set
+ End Property
+
Public Property TabIconDisp() As Boolean
Get
Return _MyTabIconDisp
Modified: trunk/Tween/Tween.vb
===================================================================
--- trunk/Tween/Tween.vb 2010-11-14 10:19:30 UTC (rev 1068)
+++ trunk/Tween/Tween.vb 2010-11-14 10:36:28 UTC (rev 1069)
@@ -686,6 +686,7 @@
SettingDialog.UseUnreadStyle = _cfgCommon.UseUnreadStyle
SettingDialog.DefaultTimeOut = _cfgCommon.DefaultTimeOut
'SettingDialog.ProtectNotInclude = _cfgCommon.ProtectNotInclude
+ SettingDialog.RetweetNoConfirm = _cfgCommon.RetweetNoConfirm
SettingDialog.PlaySound = _cfgCommon.PlaySound
SettingDialog.DateTimeFormat = _cfgCommon.DateTimeFormat
SettingDialog.LimitBalloon = _cfgCommon.LimitBalloon
@@ -1615,7 +1616,7 @@
MessageBoxIcon.Question)
Select Case rtResult
Case Windows.Forms.DialogResult.Yes
- doReTweetOriginal(False)
+ doReTweetOfficial(False)
StatusText.Text = ""
Exit Sub
Case Windows.Forms.DialogResult.Cancel
@@ -4809,7 +4810,7 @@
ElseIf e.KeyCode = Keys.R Then
e.Handled = True
e.SuppressKeyPress = True
- doReTweetOriginal(True)
+ doReTweetOfficial(True)
ElseIf e.KeyCode = Keys.P AndAlso _curPost IsNot Nothing Then
e.Handled = True
e.SuppressKeyPress = True
@@ -5548,7 +5549,7 @@
If e.KeyCode = Keys.R Then
e.Handled = True
e.SuppressKeyPress = True
- doReTweetOriginal(True)
+ doReTweetOfficial(True)
ElseIf e.KeyCode = Keys.P AndAlso _curPost IsNot Nothing Then
e.Handled = True
e.SuppressKeyPress = True
@@ -5740,6 +5741,7 @@
_cfgCommon.DateTimeFormat = SettingDialog.DateTimeFormat
_cfgCommon.DefaultTimeOut = SettingDialog.DefaultTimeOut
'_cfgCommon.ProtectNotInclude = SettingDialog.ProtectNotInclude
+ _cfgCommon.RetweetNoConfirm = SettingDialog.RetweetNoConfirm
_cfgCommon.LimitBalloon = SettingDialog.LimitBalloon
_cfgCommon.AutoShortUrlFirst = SettingDialog.AutoShortUrlFirst
_cfgCommon.TabIconDisp = SettingDialog.TabIconDisp
@@ -5985,7 +5987,7 @@
MakeReplyOrDirectStatus(False, False)
Case Keys.R
e.IsInputKey = True
- doReTweetOriginal(True)
+ doReTweetOfficial(True)
Case Keys.Q
e.IsInputKey = True
doQuote()
@@ -6030,7 +6032,7 @@
If e.Modifiers = Keys.Alt Then
If e.KeyCode = Keys.R Then
e.IsInputKey = True
- doReTweetOriginal(True)
+ doReTweetOfficial(True)
ElseIf e.KeyCode = Keys.P AndAlso _curPost IsNot Nothing Then
e.IsInputKey = True
doShowUserStatus(_curPost.Name, False)
@@ -8195,15 +8197,17 @@
doReTweetUnofficial()
End Sub
- Private Sub doReTweetOriginal(ByVal isConfirm As Boolean)
+ Private Sub doReTweetOfficial(ByVal isConfirm As Boolean)
'公式RT
If _curPost IsNot Nothing AndAlso Not _curPost.IsDm AndAlso Not _curPost.IsMe Then
If _curPost.IsProtect Then
MessageBox.Show("Protected.")
Exit Sub
End If
- If isConfirm AndAlso MessageBox.Show(My.Resources.RetweetQuestion1, "Retweet", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Cancel Then
- Exit Sub
+ If Not SettingDialog.RetweetNoConfirm Then
+ If isConfirm AndAlso MessageBox.Show(My.Resources.RetweetQuestion1, "Retweet", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Cancel Then
+ Exit Sub
+ End If
End If
Dim args As New GetWorkerArg
args.ids = New List(Of Long)
@@ -8217,7 +8221,7 @@
End Sub
Private Sub ReTweetOriginalStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ReTweetOriginalStripMenuItem.Click, RtOpMenuItem.Click
- doReTweetOriginal(True)
+ doReTweetOfficial(True)
End Sub
Private Function CreateRetweetUnofficial(ByVal status As String) As String