Skip to content

Commit d6e8406

Browse files
kzrnmkzrnm
committed
プレビューウインドウを設定でON/OFFできるようにする
1 parent d61120f commit d6e8406

6 files changed

Lines changed: 52 additions & 24 deletions

File tree

‎OpenTween/Setting/Panel/PreviewPanel.Designer.cs‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenTween/Setting/Panel/PreviewPanel.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ public void LoadConfig(SettingCommon settingCommon)
6262
this.chkTabIconDisp.Checked = settingCommon.TabIconDisp;
6363
this.CheckMonospace.Checked = settingCommon.IsMonospace;
6464
this.CheckPreviewEnable.Checked = settingCommon.PreviewEnable;
65+
this.CheckPreviewWindowEnable.Enabled = this.CheckPreviewEnable.Checked;
66+
this.CheckPreviewWindowEnable.Checked = settingCommon.PreviewWindowEnable;
6567
this.CheckStatusAreaAtBottom.Checked = settingCommon.StatusAreaAtBottom;
6668
this.ReplyIconStateCombo.SelectedIndex = settingCommon.ReplyIconState switch
6769
{
@@ -99,6 +101,7 @@ public void SaveConfig(SettingCommon settingCommon)
99101
settingCommon.TabIconDisp = this.chkTabIconDisp.Checked;
100102
settingCommon.IsMonospace = this.CheckMonospace.Checked;
101103
settingCommon.PreviewEnable = this.CheckPreviewEnable.Checked;
104+
settingCommon.PreviewWindowEnable = this.CheckPreviewWindowEnable.Checked;
102105
settingCommon.StatusAreaAtBottom = this.CheckStatusAreaAtBottom.Checked;
103106
settingCommon.ReplyIconState = this.ReplyIconStateCombo.SelectedIndex switch
104107
{
@@ -115,5 +118,10 @@ public void SaveConfig(SettingCommon settingCommon)
115118
_ => "en",
116119
};
117120
}
121+
122+
private void CheckPreviewEnable_CheckedChanged(object sender, EventArgs e)
123+
{
124+
this.CheckPreviewWindowEnable.Enabled = this.CheckPreviewEnable.Checked;
125+
}
118126
}
119127
}

‎OpenTween/Setting/Panel/PreviewPanel.en.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<data name="CheckPreviewEnable.Size" type="System.Drawing.Size, System.Drawing"><value>138, 16</value></data>
2222
<data name="CheckPreviewEnable.Text"><value>Show image thumbnail</value></data>
2323
<data name="CheckPreviewEnable.ToolTip"><value /></data>
24+
<data name="CheckPreviewWindowEnable.Size" type="System.Drawing.Size, System.Drawing"><value>138, 16</value></data>
25+
<data name="CheckPreviewWindowEnable.Text"><value>Open image thumbnail window on click</value></data>
26+
<data name="CheckPreviewWindowEnable.ToolTip"><value /></data>
2427
<data name="CheckStatusAreaAtBottom.Size" type="System.Drawing.Size, System.Drawing"><value>278, 16</value></data>
2528
<data name="CheckStatusAreaAtBottom.Text"><value>Locate tweet detail and input area at the bottom</value></data>
2629
<data name="CheckStatusAreaAtBottom.ToolTip"><value /></data>

‎OpenTween/Setting/Panel/PreviewPanel.resx‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<data name="&gt;&gt;CheckPreviewEnable.Parent"><value>$this</value></data>
3333
<data name="&gt;&gt;CheckPreviewEnable.Type"><value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
3434
<data name="&gt;&gt;CheckPreviewEnable.ZOrder"><value>3</value></data>
35+
<data name="&gt;&gt;CheckPreviewWindowEnable.Name"><value>CheckPreviewEnable</value></data>
36+
<data name="&gt;&gt;CheckPreviewWindowEnable.Parent"><value>$this</value></data>
37+
<data name="&gt;&gt;CheckPreviewWindowEnable.Type"><value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
38+
<data name="&gt;&gt;CheckPreviewWindowEnable.ZOrder"><value>3</value></data>
3539
<data name="&gt;&gt;CheckStatusAreaAtBottom.Name"><value>CheckStatusAreaAtBottom</value></data>
3640
<data name="&gt;&gt;CheckStatusAreaAtBottom.Parent"><value>$this</value></data>
3741
<data name="&gt;&gt;CheckStatusAreaAtBottom.Type"><value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
@@ -70,7 +74,7 @@
7074
<data name="&gt;&gt;ReplyIconStateCombo.ZOrder"><value>0</value></data>
7175
<data name="CheckAlwaysTop.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
7276
<data name="CheckAlwaysTop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data>
73-
<data name="CheckAlwaysTop.Location" type="System.Drawing.Point, System.Drawing"><value>23, 227</value></data>
77+
<data name="CheckAlwaysTop.Location" type="System.Drawing.Point, System.Drawing"><value>23, 252</value></data>
7478
<data name="CheckAlwaysTop.Size" type="System.Drawing.Size, System.Drawing"><value>133, 16</value></data>
7579
<data name="CheckAlwaysTop.TabIndex" type="System.Int32, mscorlib"><value>32</value></data>
7680
<data name="CheckAlwaysTop.Text"><value>常に最前面に表示する</value></data>
@@ -88,7 +92,7 @@
8892
<data name="CheckDispUsername.Text"><value>タイトルバーとツールチップにユーザー名を表示</value></data>
8993
<data name="CheckMonospace.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
9094
<data name="CheckMonospace.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data>
91-
<data name="CheckMonospace.Location" type="System.Drawing.Point, System.Drawing"><value>23, 202</value></data>
95+
<data name="CheckMonospace.Location" type="System.Drawing.Point, System.Drawing"><value>23, 227</value></data>
9296
<data name="CheckMonospace.Size" type="System.Drawing.Size, System.Drawing"><value>343, 16</value></data>
9397
<data name="CheckMonospace.TabIndex" type="System.Int32, mscorlib"><value>31</value></data>
9498
<data name="CheckMonospace.Text"><value>発言詳細を等幅フォントで表示（AA対応、フォント適用不具合あり）</value></data>
@@ -98,9 +102,15 @@
98102
<data name="CheckPreviewEnable.Size" type="System.Drawing.Size, System.Drawing"><value>243, 16</value></data>
99103
<data name="CheckPreviewEnable.TabIndex" type="System.Int32, mscorlib"><value>29</value></data>
100104
<data name="CheckPreviewEnable.Text"><value>画像リンクがあった場合にサムネイルを表示する</value></data>
105+
<data name="CheckPreviewWindowEnable.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
106+
<data name="CheckPreviewWindowEnable.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data>
107+
<data name="CheckPreviewWindowEnable.Location" type="System.Drawing.Point, System.Drawing"><value>50, 180</value></data>
108+
<data name="CheckPreviewWindowEnable.Size" type="System.Drawing.Size, System.Drawing"><value>243, 16</value></data>
109+
<data name="CheckPreviewWindowEnable.TabIndex" type="System.Int32, mscorlib"><value>29</value></data>
110+
<data name="CheckPreviewWindowEnable.Text"><value>サムネイルクリック時に画像プレビューウインドウを表示する</value></data>
101111
<data name="CheckStatusAreaAtBottom.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
102112
<data name="CheckStatusAreaAtBottom.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data>
103-
<data name="CheckStatusAreaAtBottom.Location" type="System.Drawing.Point, System.Drawing"><value>23, 177</value></data>
113+
<data name="CheckStatusAreaAtBottom.Location" type="System.Drawing.Point, System.Drawing"><value>23, 202</value></data>
104114
<data name="CheckStatusAreaAtBottom.Size" type="System.Drawing.Size, System.Drawing"><value>257, 16</value></data>
105115
<data name="CheckStatusAreaAtBottom.TabIndex" type="System.Int32, mscorlib"><value>30</value></data>
106116
<data name="CheckStatusAreaAtBottom.Text"><value>発言詳細部・入力欄を発言一覧の下に配置する</value></data>
@@ -123,7 +133,7 @@
123133
<data name="ComboDispTitle.TabIndex" type="System.Int32, mscorlib"><value>24</value></data>
124134
<data name="Label13.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
125135
<data name="Label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data>
126-
<data name="Label13.Location" type="System.Drawing.Point, System.Drawing"><value>23, 255</value></data>
136+
<data name="Label13.Location" type="System.Drawing.Point, System.Drawing"><value>23, 280</value></data>
127137
<data name="Label13.Size" type="System.Drawing.Size, System.Drawing"><value>53, 12</value></data>
128138
<data name="Label13.TabIndex" type="System.Int32, mscorlib"><value>33</value></data>
129139
<data name="Label13.Text"><value>Language</value></data>
@@ -141,14 +151,14 @@
141151
<data name="Label72.Text"><value>未読Mentions通知アイコン</value></data>
142152
<data name="Label81.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
143153
<data name="Label81.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"><value>NoControl</value></data>
144-
<data name="Label81.Location" type="System.Drawing.Point, System.Drawing"><value>92, 255</value></data>
154+
<data name="Label81.Location" type="System.Drawing.Point, System.Drawing"><value>92, 280</value></data>
145155
<data name="Label81.Size" type="System.Drawing.Size, System.Drawing"><value>115, 12</value></data>
146156
<data name="Label81.TabIndex" type="System.Int32, mscorlib"><value>34</value></data>
147157
<data name="Label81.Text"><value>Apply after restarting</value></data>
148158
<data name="LanguageCombo.Items"><value>OS Default</value></data>
149159
<data name="LanguageCombo.Items1"><value>Japanese</value></data>
150160
<data name="LanguageCombo.Items2"><value>English</value></data>
151-
<data name="LanguageCombo.Location" type="System.Drawing.Point, System.Drawing"><value>276, 252</value></data>
161+
<data name="LanguageCombo.Location" type="System.Drawing.Point, System.Drawing"><value>276, 277</value></data>
152162
<data name="LanguageCombo.Size" type="System.Drawing.Size, System.Drawing"><value>136, 20</value></data>
153163
<data name="LanguageCombo.TabIndex" type="System.Int32, mscorlib"><value>35</value></data>
154164
<data name="ReplyIconStateCombo.Items"><value>通知なし</value></data>

‎OpenTween/Setting/SettingCommon.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ private string Decrypt(string password)
169169
public bool HashIsHead = false;
170170
public bool HashIsNotAddToAtReply = true;
171171
public bool PreviewEnable = true;
172+
public bool PreviewWindowEnable = true;
172173
public bool StatusAreaAtBottom = true;
173174

174175
public MyCommon.UrlConverter AutoShortUrlFirst = MyCommon.UrlConverter.Uxnu;

‎OpenTween/TweetThumbnail.cs‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,19 @@
2121

2222
#nullable enable
2323

24+
using OpenTween.Models;
25+
using OpenTween.Setting;
26+
using OpenTween.Thumbnail;
2427
using System;
2528
using System.Collections.Generic;
2629
using System.ComponentModel;
2730
using System.Diagnostics.CodeAnalysis;
2831
using System.Drawing;
29-
using System.Data;
3032
using System.Linq;
31-
using System.Net;
32-
using System.Net.Http;
33-
using System.Text;
34-
using System.Windows.Forms;
35-
using System.Text.RegularExpressions;
36-
using System.Threading.Tasks;
37-
using OpenTween.Thumbnail;
38-
using System.Threading;
39-
using OpenTween.Models;
4033
using System.Runtime.InteropServices;
34+
using System.Threading;
35+
using System.Threading.Tasks;
36+
using System.Windows.Forms;
4137

4238
namespace OpenTween
4339
{
@@ -240,16 +236,16 @@ private void pictureBox_MouseWheel(object sender, MouseEventArgs e)
240236

241237
private void pictureBox_MouseClick(object sender, MouseEventArgs e)
242238
{
243-
var picBox = sender as PictureBox;
244-
if (picBox == null) return;
245-
246-
var thumb = picBox.Tag as ThumbnailInfo;
247-
if (thumb == null || thumb.IsPlayable) return;
248-
249-
this.ShowThubWindow(picBox.Image, thumb);
239+
if (SettingManager.Common.PreviewWindowEnable
240+
&& sender is PictureBox picBox
241+
&& picBox.Tag is ThumbnailInfo thumb
242+
&& !thumb.IsPlayable)
243+
{
244+
this.ShowThubWindow(picBox.Image);
245+
}
250246
}
251247

252-
private void ShowThubWindow(Image image, ThumbnailInfo thumbnailInfo)
248+
private void ShowThubWindow(Image image)
253249
{
254250
var thumbWindow = this.ThumbnailWindow;
255251
if (thumbWindow.Image == image)

0 commit comments

Comments
 (0)