github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG-2016: Added favicon support.

Browse source
This commit is contained in:
Robin 2016-09-05 11:12:33 +02:00
commit 9bf9c0e4e6
4 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
View file

@ -34,8 +34,8 @@
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.32\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.33\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Jira, Version=0.1.59.0, Culture=neutral, processorArchitecture=MSIL">

14
GreenshotJiraPlugin/JiraConnector.cs
View file

@ -81,6 +81,7 @@ namespace GreenshotJiraPlugin {
{
Task.Run(async () => await LogoutAsync()).Wait();
}
FavIcon?.Dispose();
}
/// <summary>
@ -97,6 +98,8 @@ namespace GreenshotJiraPlugin {
/// </summary>
public JiraMonitor Monitor { get; private set; }
public Bitmap FavIcon { get; private set; }
/// <summary>
/// Internal login which catches the exceptions
/// </summary>
@ -115,6 +118,17 @@ namespace GreenshotJiraPlugin {
loginInfo = await _jiraApi.StartSessionAsync(user, password);
Monitor = new JiraMonitor();
await Monitor.AddJiraInstanceAsync(_jiraApi);
var favIconUri = _jiraApi.JiraBaseUri.AppendSegments("favicon.ico");
try
{
FavIcon = await _jiraApi.GetUriContentAsync<Bitmap>(favIconUri);
}
catch (Exception ex)
{
Log.WarnFormat("Couldn't load favicon from {0}", favIconUri);
Log.Warn("Exception details: ", ex);
}
}
catch (Exception)
{

12
GreenshotJiraPlugin/JiraDestination.cs
View file

@ -73,9 +73,17 @@ namespace GreenshotJiraPlugin {
get
{
Image displayIcon = null;
if (_jiraIssue != null && JiraPlugin.Instance.CurrentJiraConnector != null)
var jiraConnector = JiraPlugin.Instance.CurrentJiraConnector;
if (jiraConnector != null)
{
displayIcon = JiraPlugin.Instance.CurrentJiraConnector.GetIssueTypeBitmapAsync(_jiraIssue).Result;
if (_jiraIssue != null)
{
displayIcon = jiraConnector.GetIssueTypeBitmapAsync(_jiraIssue).Result;
}
else
{
displayIcon = jiraConnector.FavIcon;
}
}
if (displayIcon == null)
{

2
GreenshotJiraPlugin/packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapplo.HttpExtensions" version="0.5.32" targetFramework="net45" />
<package id="Dapplo.HttpExtensions" version="0.5.33" targetFramework="net45" />
<package id="Dapplo.Jira" version="0.1.59" targetFramework="net45" />
<package id="Dapplo.Log.Facade" version="0.5.4" targetFramework="net45" />
<package id="LibZ.Tool" version="1.2.0.0" targetFramework="net45" />