svnno****@sourc*****
svnno****@sourc*****
2010年 11月 20日 (土) 18:15:30 JST
Revision: 1086
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1086
Author: f_swallow
Date: 2010-11-20 18:15:29 +0900 (Sat, 20 Nov 2010)
Log Message:
-----------
投稿をShift+Enterからできるようにした。Ctrl+EnterのShift版。フッタはCtrl+Shift+Enterで付与しない
Modified Paths:
--------------
trunk/Tween/Setting/SettingCommon.vb
trunk/Tween/Setting.Designer.vb
trunk/Tween/Setting.en.resx
trunk/Tween/Setting.resx
trunk/Tween/Setting.vb
trunk/Tween/Setting.zh-CHS.resx
trunk/Tween/Tween.vb
-------------- next part --------------
Modified: trunk/Tween/Setting/SettingCommon.vb
===================================================================
--- trunk/Tween/Setting/SettingCommon.vb 2010-11-19 08:58:59 UTC (rev 1085)
+++ trunk/Tween/Setting/SettingCommon.vb 2010-11-20 09:15:29 UTC (rev 1086)
@@ -98,6 +98,7 @@
Public OneWayLove As Boolean = True
Public NameBalloon As NameBalloonEnum = NameBalloonEnum.NickName
Public PostCtrlEnter As Boolean = False
+ Public PostShiftEnter As Boolean = False
Public CountApi As Integer = 60
Public CountApiReply As Integer = 40
Public PostAndGet As Boolean = True
Modified: trunk/Tween/Setting.Designer.vb
===================================================================
--- trunk/Tween/Setting.Designer.vb 2010-11-19 08:58:59 UTC (rev 1085)
+++ trunk/Tween/Setting.Designer.vb 2010-11-20 09:15:29 UTC (rev 1086)
@@ -156,6 +156,8 @@
Me.Label74 = New System.Windows.Forms.Label()
Me.chkGetFav = New System.Windows.Forms.CheckBox()
Me.TabPage2 = New System.Windows.Forms.TabPage()
+ Me.CheckRetweetNoConfirm = New System.Windows.Forms.CheckBox()
+ Me.Label42 = New System.Windows.Forms.Label()
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.HotkeyCheck = New System.Windows.Forms.CheckBox()
Me.HotkeyCode = New System.Windows.Forms.Label()
@@ -248,8 +250,7 @@
Me.Label59 = New System.Windows.Forms.Label()
Me.TextBoxOutputzKey = New System.Windows.Forms.TextBox()
Me.CheckOutputz = New System.Windows.Forms.CheckBox()
- Me.Label42 = New System.Windows.Forms.Label()
- Me.CheckRetweetNoConfirm = New System.Windows.Forms.CheckBox()
+ Me.CheckPostShiftEnter = New System.Windows.Forms.CheckBox()
Me.GroupBox1.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -1088,6 +1089,7 @@
'
'TabPage2
'
+ Me.TabPage2.Controls.Add(Me.CheckPostShiftEnter)
Me.TabPage2.Controls.Add(Me.CheckRetweetNoConfirm)
Me.TabPage2.Controls.Add(Me.Label42)
Me.TabPage2.Controls.Add(Me.GroupBox3)
@@ -1131,6 +1133,17 @@
Me.TabPage2.Name = "TabPage2"
Me.TabPage2.UseVisualStyleBackColor = True
'
+ 'CheckRetweetNoConfirm
+ '
+ resources.ApplyResources(Me.CheckRetweetNoConfirm, "CheckRetweetNoConfirm")
+ Me.CheckRetweetNoConfirm.Name = "CheckRetweetNoConfirm"
+ Me.CheckRetweetNoConfirm.UseVisualStyleBackColor = True
+ '
+ 'Label42
+ '
+ resources.ApplyResources(Me.Label42, "Label42")
+ Me.Label42.Name = "Label42"
+ '
'GroupBox3
'
Me.GroupBox3.Controls.Add(Me.HotkeyCheck)
@@ -1737,17 +1750,12 @@
Me.CheckOutputz.Name = "CheckOutputz"
Me.CheckOutputz.UseVisualStyleBackColor = True
'
- 'Label42
+ 'CheckPostShiftEnter
'
- resources.ApplyResources(Me.Label42, "Label42")
- Me.Label42.Name = "Label42"
+ resources.ApplyResources(Me.CheckPostShiftEnter, "CheckPostShiftEnter")
+ Me.CheckPostShiftEnter.Name = "CheckPostShiftEnter"
+ Me.CheckPostShiftEnter.UseVisualStyleBackColor = True
'
- 'CheckRetweetNoConfirm
- '
- resources.ApplyResources(Me.CheckRetweetNoConfirm, "CheckRetweetNoConfirm")
- Me.CheckRetweetNoConfirm.Name = "CheckRetweetNoConfirm"
- Me.CheckRetweetNoConfirm.UseVisualStyleBackColor = True
- '
'Setting
'
Me.AcceptButton = Me.Save
@@ -2010,4 +2018,5 @@
Friend WithEvents FavoritesTextCountApi As System.Windows.Forms.TextBox
Friend WithEvents CheckRetweetNoConfirm As System.Windows.Forms.CheckBox
Friend WithEvents Label42 As System.Windows.Forms.Label
+ Friend WithEvents CheckPostShiftEnter As System.Windows.Forms.CheckBox
End Class
Modified: trunk/Tween/Setting.en.resx
===================================================================
--- trunk/Tween/Setting.en.resx 2010-11-19 08:58:59 UTC (rev 1085)
+++ trunk/Tween/Setting.en.resx 2010-11-20 09:15:29 UTC (rev 1086)
@@ -981,4 +981,7 @@
<data name="Label66.Text" xml:space="preserve">
<value>Favorites/PublicSearchの取得数</value>
</data>
+ <data name="CheckPostShiftEnter.Text" xml:space="preserve">
+ <value>Shift+Enterにする</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tween/Setting.resx
===================================================================
--- trunk/Tween/Setting.resx 2010-11-19 08:58:59 UTC (rev 1085)
+++ trunk/Tween/Setting.resx 2010-11-20 09:15:29 UTC (rev 1086)
@@ -465,7 +465,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label12.ZOrder" xml:space="preserve">
- <value>36</value>
+ <value>37</value>
</data>
<data name="StatusText.Location" type="System.Drawing.Point, System.Drawing">
<value>173, 332</value>
@@ -486,7 +486,7 @@
<value>TabPage2</value>
</data>
<data name=">>StatusText.ZOrder" xml:space="preserve">
- <value>37</value>
+ <value>38</value>
</data>
<data name="PlaySnd.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -513,7 +513,7 @@
<value>TabPage2</value>
</data>
<data name=">>PlaySnd.ZOrder" xml:space="preserve">
- <value>21</value>
+ <value>22</value>
</data>
<data name="Label14.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -540,7 +540,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label14.ZOrder" xml:space="preserve">
- <value>22</value>
+ <value>23</value>
</data>
<data name="Label15.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 25</value>
@@ -564,7 +564,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label15.ZOrder" xml:space="preserve">
- <value>23</value>
+ <value>24</value>
</data>
<data name="OneWayLv.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2197,7 +2197,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckUseRecommendStatus.ZOrder" xml:space="preserve">
- <value>38</value>
+ <value>39</value>
</data>
<data name="CmbDateTimeFormat.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@@ -2368,7 +2368,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckPostCtrlEnter.ZOrder" xml:space="preserve">
- <value>34</value>
+ <value>35</value>
</data>
<data name="Label27.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2395,7 +2395,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label27.ZOrder" xml:space="preserve">
- <value>32</value>
+ <value>33</value>
</data>
<data name="TextBox3.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
@@ -2482,7 +2482,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label38.ZOrder" xml:space="preserve">
- <value>24</value>
+ <value>25</value>
</data>
<data name="UReadMng.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2509,7 +2509,7 @@
<value>TabPage2</value>
</data>
<data name=">>UReadMng.ZOrder" xml:space="preserve">
- <value>26</value>
+ <value>27</value>
</data>
<data name="Label39.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2536,7 +2536,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label39.ZOrder" xml:space="preserve">
- <value>33</value>
+ <value>34</value>
</data>
<data name="CheckReadOldPosts.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2563,7 +2563,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckReadOldPosts.ZOrder" xml:space="preserve">
- <value>35</value>
+ <value>36</value>
</data>
<data name="Label40.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2590,7 +2590,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label40.ZOrder" xml:space="preserve">
- <value>29</value>
+ <value>30</value>
</data>
<data name="CheckCloseToExit.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2617,7 +2617,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckCloseToExit.ZOrder" xml:space="preserve">
- <value>28</value>
+ <value>29</value>
</data>
<data name="Label41.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2644,7 +2644,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label41.ZOrder" xml:space="preserve">
- <value>31</value>
+ <value>32</value>
</data>
<data name="CheckMinimizeToTray.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2671,7 +2671,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckMinimizeToTray.ZOrder" xml:space="preserve">
- <value>30</value>
+ <value>31</value>
</data>
<data name="BrowserPathText.Location" type="System.Drawing.Point, System.Drawing">
<value>173, 283</value>
@@ -2692,7 +2692,7 @@
<value>TabPage2</value>
</data>
<data name=">>BrowserPathText.ZOrder" xml:space="preserve">
- <value>25</value>
+ <value>26</value>
</data>
<data name="Label44.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -2719,7 +2719,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label44.ZOrder" xml:space="preserve">
- <value>27</value>
+ <value>28</value>
</data>
<data name="CheckDispUsername.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3660,6 +3660,33 @@
<data name=">>TabPage1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="CheckPostShiftEnter.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="CheckPostShiftEnter.Location" type="System.Drawing.Point, System.Drawing">
+ <value>283, 238</value>
+ </data>
+ <data name="CheckPostShiftEnter.Size" type="System.Drawing.Size, System.Drawing">
+ <value>109, 16</value>
+ </data>
+ <data name="CheckPostShiftEnter.TabIndex" type="System.Int32, mscorlib">
+ <value>41</value>
+ </data>
+ <data name="CheckPostShiftEnter.Text" xml:space="preserve">
+ <value>Shift+Enterにする</value>
+ </data>
+ <data name=">>CheckPostShiftEnter.Name" xml:space="preserve">
+ <value>CheckPostShiftEnter</value>
+ </data>
+ <data name=">>CheckPostShiftEnter.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=">>CheckPostShiftEnter.Parent" xml:space="preserve">
+ <value>TabPage2</value>
+ </data>
+ <data name=">>CheckPostShiftEnter.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="CheckRetweetNoConfirm.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -3685,7 +3712,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckRetweetNoConfirm.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="Label42.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3712,7 +3739,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label42.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="HotkeyCheck.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3934,7 +3961,7 @@
<value>TabPage2</value>
</data>
<data name=">>GroupBox3.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="Label82.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3964,7 +3991,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label82.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="CheckHashSupple.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -3994,7 +4021,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckHashSupple.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="Label79.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4024,7 +4051,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label79.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>6</value>
</data>
<data name="CheckAtIdSupple.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4054,7 +4081,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckAtIdSupple.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>7</value>
</data>
<data name="TextBitlyPw.Location" type="System.Drawing.Point, System.Drawing">
<value>318, 213</value>
@@ -4075,7 +4102,7 @@
<value>TabPage2</value>
</data>
<data name=">>TextBitlyPw.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>8</value>
</data>
<data name="Label77.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4102,7 +4129,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label77.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>9</value>
</data>
<data name="TextBitlyId.Location" type="System.Drawing.Point, System.Drawing">
<value>194, 213</value>
@@ -4123,7 +4150,7 @@
<value>TabPage2</value>
</data>
<data name=">>TextBitlyId.ZOrder" xml:space="preserve">
- <value>9</value>
+ <value>10</value>
</data>
<data name="Label76.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4150,7 +4177,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label76.ZOrder" xml:space="preserve">
- <value>10</value>
+ <value>11</value>
</data>
<data name="ComboBoxAutoShortUrlFirst.Items" xml:space="preserve">
<value>tinyurl</value>
@@ -4186,7 +4213,7 @@
<value>TabPage2</value>
</data>
<data name=">>ComboBoxAutoShortUrlFirst.ZOrder" xml:space="preserve">
- <value>11</value>
+ <value>12</value>
</data>
<data name="Label71.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4216,7 +4243,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label71.ZOrder" xml:space="preserve">
- <value>12</value>
+ <value>13</value>
</data>
<data name="CheckAutoConvertUrl.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4246,7 +4273,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckAutoConvertUrl.ZOrder" xml:space="preserve">
- <value>13</value>
+ <value>14</value>
</data>
<data name="Label29.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4276,7 +4303,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label29.ZOrder" xml:space="preserve">
- <value>14</value>
+ <value>15</value>
</data>
<data name="Label57.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4303,7 +4330,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label57.ZOrder" xml:space="preserve">
- <value>15</value>
+ <value>16</value>
</data>
<data name="Label56.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4330,7 +4357,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label56.ZOrder" xml:space="preserve">
- <value>16</value>
+ <value>17</value>
</data>
<data name="CheckFavRestrict.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4357,7 +4384,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckFavRestrict.ZOrder" xml:space="preserve">
- <value>17</value>
+ <value>18</value>
</data>
<data name="CheckTinyURL.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4384,7 +4411,7 @@
<value>TabPage2</value>
</data>
<data name=">>CheckTinyURL.ZOrder" xml:space="preserve">
- <value>18</value>
+ <value>19</value>
</data>
<data name="Label50.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -4411,7 +4438,7 @@
<value>TabPage2</value>
</data>
<data name=">>Label50.ZOrder" xml:space="preserve">
- <value>19</value>
+ <value>20</value>
</data>
<data name="Button3.Location" type="System.Drawing.Point, System.Drawing">
<value>301, 281</value>
@@ -4435,7 +4462,7 @@
<value>TabPage2</value>
</data>
<data name=">>Button3.ZOrder" xml:space="preserve">
- <value>20</value>
+ <value>21</value>
</data>
<data name="TabPage2.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
Modified: trunk/Tween/Setting.vb
===================================================================
--- trunk/Tween/Setting.vb 2010-11-19 08:58:59 UTC (rev 1085)
+++ trunk/Tween/Setting.vb 2010-11-20 09:15:29 UTC (rev 1086)
@@ -65,6 +65,7 @@
Private _clDetailLink As Color
Private _MyNameBalloon As NameBalloonEnum
Private _MyPostCtrlEnter As Boolean
+ Private _MyPostShiftEnter As Boolean
Private _usePostMethod As Boolean
Private _countApi As Integer
Private _countApiReply As Integer
@@ -200,6 +201,7 @@
_MyNameBalloon = NameBalloonEnum.NickName
End Select
_MyPostCtrlEnter = CheckPostCtrlEnter.Checked
+ _MyPostShiftEnter = CheckPostShiftEnter.Checked
_usePostMethod = False
_countApi = CType(TextCountApi.Text, Integer)
_countApiReply = CType(TextCountApiReply.Text, Integer)
@@ -428,6 +430,7 @@
End Select
CheckPostCtrlEnter.Checked = _MyPostCtrlEnter
+ CheckPostShiftEnter.Checked = _MyPostShiftEnter
TextCountApi.Text = _countApi.ToString
TextCountApiReply.Text = _countApiReply.ToString
@@ -1108,6 +1111,15 @@
End Set
End Property
+ Public Property PostShiftEnter() As Boolean
+ Get
+ Return _MyPostShiftEnter
+ End Get
+ Set(ByVal value As Boolean)
+ _MyPostShiftEnter = value
+ End Set
+ End Property
+
Public Property CountApi() As Integer
Get
Return _countApi
@@ -2118,5 +2130,17 @@
Exit Sub
End If
End Sub
+
+ Private Sub CheckPostCtrlEnter_CheckedChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles CheckPostCtrlEnter.CheckedChanged
+ If CheckPostShiftEnter.Checked AndAlso CheckPostCtrlEnter.Checked Then
+ CheckPostShiftEnter.Checked = False
+ End If
+ End Sub
+
+ Private Sub CheckPostShiftEnter_CheckedChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles CheckPostShiftEnter.CheckedChanged
+ If CheckPostShiftEnter.Checked AndAlso CheckPostCtrlEnter.Checked Then
+ CheckPostCtrlEnter.Checked = False
+ End If
+ End Sub
End Class
Modified: trunk/Tween/Setting.zh-CHS.resx
===================================================================
--- trunk/Tween/Setting.zh-CHS.resx 2010-11-19 08:58:59 UTC (rev 1085)
+++ trunk/Tween/Setting.zh-CHS.resx 2010-11-20 09:15:29 UTC (rev 1086)
@@ -913,4 +913,7 @@
<data name="Label66.Text" xml:space="preserve">
<value>Favorites/PublicSearchの取得数</value>
</data>
+ <data name="CheckPostShiftEnter.Text" xml:space="preserve">
+ <value>Shift+Enterにする</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tween/Tween.vb
===================================================================
--- trunk/Tween/Tween.vb 2010-11-19 08:58:59 UTC (rev 1085)
+++ trunk/Tween/Tween.vb 2010-11-20 09:15:29 UTC (rev 1086)
@@ -649,8 +649,8 @@
SettingDialog.NameBalloon = _cfgCommon.NameBalloon
SettingDialog.PostCtrlEnter = _cfgCommon.PostCtrlEnter
+ SettingDialog.PostShiftEnter = _cfgCommon.PostShiftEnter
-
SettingDialog.CountApi = _cfgCommon.CountApi
SettingDialog.CountApiReply = _cfgCommon.CountApiReply
If SettingDialog.CountApi < 20 OrElse SettingDialog.CountApi > 200 Then SettingDialog.CountApi = 60
@@ -1663,6 +1663,9 @@
'複数行でEnter投稿の場合、Ctrlも押されていたらフッタ付加しない
isRemoveFooter = My.Computer.Keyboard.CtrlKeyDown
End If
+ If SettingDialog.PostShiftEnter Then
+ isRemoveFooter = My.Computer.Keyboard.CtrlKeyDown
+ End If
If Not isRemoveFooter AndAlso (StatusText.Text.Contains("RT @") OrElse StatusText.Text.Contains("QT @")) Then
isRemoveFooter = True
End If
@@ -5721,6 +5724,7 @@
_cfgCommon.NameBalloon = SettingDialog.NameBalloon
_cfgCommon.PostCtrlEnter = SettingDialog.PostCtrlEnter
+ _cfgCommon.PostShiftEnter = SettingDialog.PostShiftEnter
_cfgCommon.CountApi = SettingDialog.CountApi
_cfgCommon.CountApiReply = SettingDialog.CountApiReply
'_cfgCommon.CheckReply = SettingDialog.CheckReply
@@ -6798,8 +6802,10 @@
If StatusText.Focused Then
'改行
If StatusText.Multiline AndAlso _
- (keyData And Keys.Shift) = Keys.Shift AndAlso _
- (keyData And Keys.Control) <> Keys.Control Then
+ (Not SettingDialog.PostShiftEnter AndAlso (keyData And Keys.Shift) = Keys.Shift AndAlso _
+ (keyData And Keys.Control) <> Keys.Control) OrElse _
+ (SettingDialog.PostShiftEnter AndAlso (keyData And Keys.Control) = Keys.Control AndAlso _
+ (keyData And Keys.Shift) <> Keys.Shift) Then
Dim pos1 As Integer = StatusText.SelectionStart
If StatusText.SelectionLength > 0 Then
StatusText.Text = StatusText.Text.Remove(pos1, StatusText.SelectionLength) '選択状態文字列削除
@@ -6811,12 +6817,15 @@
'投稿
If (Not StatusText.Multiline AndAlso _
((keyData And Keys.Control) = Keys.Control AndAlso SettingDialog.PostCtrlEnter) OrElse _
- ((keyData And Keys.Control) <> Keys.Control AndAlso Not SettingDialog.PostCtrlEnter)) OrElse _
+ ((keyData And Keys.Shift) = Keys.Shift AndAlso SettingDialog.PostShiftEnter) OrElse _
+ (((keyData And Keys.Control) <> Keys.Control AndAlso Not SettingDialog.PostCtrlEnter) AndAlso _
+ ((keyData And Keys.Shift) <> Keys.Shift AndAlso Not SettingDialog.PostShiftEnter))) OrElse _
(StatusText.Multiline AndAlso _
- (Not SettingDialog.PostCtrlEnter AndAlso _
+ (Not SettingDialog.PostCtrlEnter AndAlso Not SettingDialog.PostShiftEnter AndAlso _
((keyData And Keys.Control) <> Keys.Control AndAlso (keyData And Keys.Shift) <> Keys.Shift) OrElse _
((keyData And Keys.Control) = Keys.Control AndAlso (keyData And Keys.Shift) = Keys.Shift)) OrElse _
- (SettingDialog.PostCtrlEnter AndAlso (keyData And Keys.Control) = Keys.Control)) Then
+ (SettingDialog.PostCtrlEnter AndAlso (keyData And Keys.Control) = Keys.Control) OrElse _
+ (SettingDialog.PostShiftEnter AndAlso (keyData And Keys.Shift) = Keys.Shift)) Then
PostButton_Click(Nothing, Nothing)
Return True
End If