Skip to content

Commit

Permalink
画像ビューアに渡す画像URL判別を大文字小文字を無視するよう修正
Browse files Browse the repository at this point in the history
左のレス一覧の表示非表示オプションボタン追加
  • Loading branch information
ggslyman committed Apr 2, 2014
1 parent faec93c commit 0e2f978
Show file tree
Hide file tree
Showing 8 changed files with 111 additions and 16 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@

##更新履歴

* 14/04/03 2.0.1 Rev.13
- 画像をビューアに表示するURL判別が小文字固定になってたので、大文字小文字を無視して判別するよう修正
- 左のレス一覧を隠すオプションボタンを追加
- 同梱のregファイルが間違っていたので修正

* 14/03/25 2.0.1 Rev.12
- youtubeのビューアオープン時にURLの形式によって落ちるエラーを修正

Expand Down
62 changes: 51 additions & 11 deletions SpeechCast/FormMain.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 34 additions & 2 deletions SpeechCast/FormMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public FormMain()
void webBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs e)
{
string url = e.Url.AbsoluteUri;
string diffurl = url.ToLower();
if (url.StartsWith(Response.AnchorUrl))
{
e.Cancel = true;
Expand All @@ -86,7 +87,7 @@ void webBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs e)
webBrowser.Document.Window.ScrollTo(0, GetResponsesScrollY(resNo));
}
}
else if (url.EndsWith("jpg") || url.EndsWith("png") || url.EndsWith("gif"))
else if (diffurl.EndsWith("jpg") || diffurl.EndsWith("png") || diffurl.EndsWith("gif") || diffurl.EndsWith("jpeg") || diffurl.EndsWith("bmp"))
{
e.Cancel = true;
oepnFormViewNewtabImg(url);
Expand All @@ -100,7 +101,7 @@ void webBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs e)
oepnFormViewNewtabYoutube(id);
}
}
else if (url.StartsWith("http:"))
else if (diffurl.StartsWith("http:"))
{
System.Diagnostics.Process.Start(url);
e.Cancel = true;
Expand Down Expand Up @@ -1366,6 +1367,8 @@ private void FormMain_Load(object sender, EventArgs e)
toolStripButtonPlaySoundNewResponse.Checked = UserConfig.PlaySoundNewResponse;
this.splitContainerResCaption.SplitterDistance = 2000;
toolStripButtonAutoScroll.Checked = UserConfig.EnableAutoScroll;
toolStripButtonListToggle.Checked = !UserConfig.ViewResList;
this.viewResList(UserConfig.ViewResList);
}
catch (Exception ex)
{
Expand Down Expand Up @@ -1417,6 +1420,7 @@ private void FormMain_Load(object sender, EventArgs e)
myToolStripPlay.GripStyle = ToolStripGripStyle.Hidden;
myToolStripUrl.GripStyle = ToolStripGripStyle.Hidden;
myToolStripVoice.GripStyle = ToolStripGripStyle.Hidden;
myToolStripBrowser.GripStyle = ToolStripGripStyle.Hidden;
//idx = toolStripComboBoxVolume.Items.IndexOf(UserConfig.SpeakingVolume);
//if (idx >= 0)
//{
Expand Down Expand Up @@ -2156,5 +2160,33 @@ private void toolStripButtonAutoScroll_Click(object sender, EventArgs e)
toolStripButtonAutoScroll.Checked = UserConfig.EnableAutoScroll;
}

private void toolStripButton19_Click(object sender, EventArgs e)
{

}

private void toolStripButtonListToggle_Click(object sender, EventArgs e)
{
UserConfig.ViewResList = !toolStripButtonListToggle.Checked;
this.viewResList(UserConfig.ViewResList);
}

private void viewResList(bool visibleFlag)
{
if (visibleFlag)
{
splitContainer1.Panel1MinSize = 25;
splitContainer1.SplitterDistance = 300;
splitContainer1.IsSplitterFixed = false;
}
else
{
splitContainer1.Panel1MinSize = 0;
splitContainer1.SplitterDistance = 0;
splitContainer1.IsSplitterFixed = true;
}

}

}
}
16 changes: 16 additions & 0 deletions SpeechCast/FormMain.resx
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,22 @@
oPfhfPY17gk8LSdqtZoykR4BLafno+9xK/BnORGJRGA0GtFsNnWVE5cCXOW04jkcDiQSCd3lhCbAVU4M
BgOYzWblLVYP6YIEuMuJSqWirMvqrm68Xi9/OZHJZNBut4UJ0H+BOuQjFotht9sJE3iZXC4nr5wol8ty
BUQ+/7cYjUZyBejPVh1KwGD4AviBEVR7l+KDAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="myToolStripBrowser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>792, 17</value>
</metadata>
<data name="toolStripButtonListToggle.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVFhH3Za/qoJwGIa1iKBa8hpaWoJWoTlob2jPoa3F
xRto6AYa2h2ERsE58AK8gcZoiYYKyj/f8Qs8+EoFnfQnnBcegvf3ffZAoklxKM1ms+FPofkfAr7v/1n8
a4HD4UDz+bwcgdPpRP1+n0ajkXiB6/VKg8HgsSdc4H6/J1/6QKhAGIY0mUxgT6jAbDaDHUaYgGEYMJ8g
RGC5XMJsmlarRd1u92PiXbzQK4H1ek2yLMNsTmDxTMCyLKpWqzCXI1hkBRzHoXq9DjM5g0VawHVdajab
cF4AWCQCnudRu92Gs4LAIhHYbrfUaDTgrCCwSP8Etm1TrVaD8wLAInsTmqZJlUoFZnIGi6wAZ7VaFfUM
YLB4JsBZLBYwlyNYvBLg6LoOs2n4XlEU5WPiXbzQO4Eoimg6ncJ8grC3YRAENB6PYYcR+n/gdrvRcDiE
PaECnPP5TKqq/u4JF+Acj0fq9XqPvVIEOPv9njqdTnkCnN1uR5qmlSfAuVwu5Qp8kxIFJOkH/IagGYbP
92UAAAAASUVORK5CYII=
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
Expand Down
4 changes: 2 additions & 2 deletions SpeechCast/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
// 既定値にすることができます:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.1.12")]
[assembly: AssemblyFileVersion("2.0.1.12")]
[assembly: AssemblyVersion("2.0.1.13")]
[assembly: AssemblyFileVersion("2.0.1.13")]
Binary file added SpeechCast/Resources/download-alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion SpeechCast/SpeechCast.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</PropertyGroup>
<PropertyGroup />
<PropertyGroup>
<SignManifests>true</SignManifests>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
Expand Down
2 changes: 2 additions & 0 deletions SpeechCast/UseConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ public void SupplementSettings()
/// </summary>
public int AutoScrollSpeed = 1;

public bool ViewResList = true;

/// <summary>
/// 読み上げONOFF
/// </summary>
Expand Down

0 comments on commit 0e2f978

Please sign in to comment.