Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed up images

  • Loading branch information...
commit 6806b9a351d841b66dd8e50b0efb94242f601244 1 parent 31b802f
@JakeGinnivan JakeGinnivan authored
View
3  .gitignore
@@ -14,4 +14,5 @@ artifacts/log
artifacts/
post-build*
_ReSharper.*
-deploy-to-ec2*
+deploy-to-ec2*
+publish/
View
24 src/GithubForOutlook.Logic/GithubForOutlook.Logic.csproj
@@ -67,7 +67,7 @@
<HintPath>..\packages\RestSharp.102.7\lib\net35\RestSharp.dll</HintPath>
</Reference>
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <EmbedInteropTypes>True</EmbedInteropTypes>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -82,16 +82,20 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
- <Reference Include="VSTOContrib.Core, Version=0.9.0.67, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\VSTOContrib.Outlook.0.9.0.67\tools\net40\2010\VSTOContrib.Core.dll</HintPath>
+ <Reference Include="VSTOContrib.Core, Version=0.10.0.73, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\VSTOContrib.Outlook.0.10.0.73\tools\net40\2010\VSTOContrib.Core.dll</HintPath>
</Reference>
- <Reference Include="VSTOContrib.Extensions.Proxies">
+ <Reference Include="VSTOContrib.Extensions.Proxies, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\libs\VSTOContrib.Extensions.Proxies.dll</HintPath>
</Reference>
- <Reference Include="VSTOContrib.Outlook, Version=0.9.0.67, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\VSTOContrib.Outlook.0.9.0.67\tools\net40\2010\VSTOContrib.Outlook.dll</HintPath>
+ <Reference Include="VSTOContrib.Outlook, Version=0.10.0.73, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\VSTOContrib.Outlook.0.10.0.73\tools\net40\2010\VSTOContrib.Outlook.dll</HintPath>
</Reference>
- <Reference Include="VSTOContrib.Outlook.Extensions.Proxies">
+ <Reference Include="VSTOContrib.Outlook.Extensions.Proxies, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\libs\VSTOContrib.Outlook.Extensions.Proxies.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
@@ -147,9 +151,11 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="Ribbons\Email\GithubMailItem.xml" />
+ <EmbeddedResource Include="Ribbons\Email\GithubMailItem.xml">
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Ribbons\MainExplorer\GithubExplorerRibbon.xml" />
- <None Include="Resources\gtfo32x32.png" />
+ <EmbeddedResource Include="Resources\gtfo32x32.png" />
<Content Include="VSTOContrib.GettingStarted.txt" />
</ItemGroup>
<ItemGroup />
View
5 src/GithubForOutlook.Logic/Ribbons/Email/GithubMailItem.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<customUI onLoad="Ribbon_Load" xmlns="http://schemas.microsoft.com/office/2006/01/customui">
+<customUI onLoad="Ribbon_Load"
+ xmlns="http://schemas.microsoft.com/office/2006/01/customui">
<ribbon>
<tabs>
<tab idMso="TabReadMessage">
<group id="githubGroup" label="GitHub">
- <button id="createTask" label="Create on Github" onAction="CreateIssue"/>
+ <button id="createTask" label="Create on Github" onAction="CreateIssue" image="Resources\gtfo32x32.png" />
</group>
</tab>
</tabs>
View
6 src/GithubForOutlook.Logic/Ribbons/MainExplorer/GithubExplorerRibbon.cs
@@ -11,6 +11,7 @@
using VSTOContrib.Core.Wpf;
using VSTOContrib.Outlook.RibbonFactory;
using VSTOContrib.Core.Extensions;
+using stdole;
namespace GithubForOutlook.Logic.Ribbons.MainExplorer
{
@@ -29,6 +30,7 @@ public class GithubExplorerRibbon : OfficeViewModelBase, IRibbonViewModel
private Explorer explorer;
+
public void Initialised(object context)
{
}
@@ -127,13 +129,13 @@ public bool MailItemSelected
}
}
- public Bitmap GetImage(IRibbonControl control)
+ public IPictureDisp GetImage(IRibbonControl control)
{
switch (control.Id)
{
case "createTask":
{
- return new Bitmap(Properties.Resources.gtfo32x32);
+ return base.GetPicture(Properties.Resources.gtfo32x32);
}
}
return null;
View
3  src/GithubForOutlook.Logic/Ribbons/MainExplorer/GithubExplorerRibbon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<customUI onLoad="Ribbon_Load" xmlns="http://schemas.microsoft.com/office/2006/01/customui">
+<customUI onLoad="Ribbon_Load" loadImage="GetImage" xmlns="http://schemas.microsoft.com/office/2006/01/customui">
<ribbon>
<tabs>
<tab idMso="TabMail">
@@ -9,6 +9,7 @@
screentip="Create on Github"
size="large"
showImage="true"
+ getImage="GetImage"
onAction="CreateIssue"
getEnabled="MailItemSelected" />
<button id="settings" label="Settings" onAction="ShowSettings" />
View
2  src/GithubForOutlook.Logic/packages.config
@@ -6,5 +6,5 @@
<package id="Newtonsoft.Json" version="4.0.8" />
<package id="NGitHub" version="1.0.0.11" />
<package id="RestSharp" version="102.7" />
- <package id="VSTOContrib.Outlook" version="0.9.0.67" />
+ <package id="VSTOContrib.Outlook" version="0.10.0.73" />
</packages>
View
2  src/GithubForOutlook.Tests/AddinBootstrapper.cs
@@ -1,6 +1,6 @@
using System;
-namespace GithubForOutlook.Tests
+namespace GithubForOutlook.TestsCore
{
public class AddinBootstrapper2 : IDisposable
{
View
10 src/GithubForOutlook.Tests/GithubForOutlook.Tests.csproj
@@ -52,11 +52,13 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
- <Reference Include="VSTOContrib.Core">
- <HintPath>..\packages\VSTOContrib.Outlook.0.9.0.67\tools\net40\2007\VSTOContrib.Core.dll</HintPath>
+ <Reference Include="VSTOContrib.Core, Version=0.10.0.73, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\VSTOContrib.Outlook.0.10.0.73\tools\net40\2007\VSTOContrib.Core.dll</HintPath>
</Reference>
- <Reference Include="VSTOContrib.Outlook">
- <HintPath>..\packages\VSTOContrib.Outlook.0.9.0.67\tools\net40\2007\VSTOContrib.Outlook.dll</HintPath>
+ <Reference Include="VSTOContrib.Outlook, Version=0.10.0.73, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\VSTOContrib.Outlook.0.10.0.73\tools\net40\2007\VSTOContrib.Outlook.dll</HintPath>
</Reference>
<Reference Include="xunit">
<HintPath>..\packages\xunit.1.9.0.1566\lib\xunit.dll</HintPath>
View
2  src/GithubForOutlook.Tests/packages.config
@@ -4,6 +4,6 @@
<package id="NGitHub" version="1.0.0.11" />
<package id="NSubstitute" version="1.3.0.0" />
<package id="RestSharp" version="102.7" />
- <package id="VSTOContrib.Outlook" version="0.9.0.67" />
+ <package id="VSTOContrib.Outlook" version="0.10.0.73" />
<package id="xunit" version="1.9.0.1566" />
</packages>
View
40 src/GithubForOutlook/AddinBootstrapper.cs
@@ -1,20 +1,20 @@
-using System;
-
-namespace GithubForOutlookCore
-{
- public class AddinBootstrapper2 : IDisposable
- {
- public object Resolve(Type type)
- {
- return Activator.CreateInstance(type);
- }
-
- public T Resolve<T>()
- {
- return Activator.CreateInstance<T>();
- }
-
- public void Dispose()
- { }
- }
-}
+using System;
+
+namespace GithubForOutlookCore
+{
+ public class AddinBootstrapper2 : IDisposable
+ {
+ public object Resolve(Type type)
+ {
+ return Activator.CreateInstance(type);
+ }
+
+ public T Resolve<T>()
+ {
+ return Activator.CreateInstance<T>();
+ }
+
+ public void Dispose()
+ { }
+ }
+}
View
44 src/GithubForOutlook/GithubForOutlook.csproj
@@ -26,14 +26,27 @@
<NoStandardLibraries>false</NoStandardLibraries>
<RootNamespace>GithubForOutlook</RootNamespace>
<AssemblyName>GithubForOutlook</AssemblyName>
- <LoadBehavior>3</LoadBehavior>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<DefineConstants>VSTO40</DefineConstants>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- <BootstrapperComponentsLocation>HomeSite</BootstrapperComponentsLocation>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
<RestorePackages>true</RestorePackages>
+ <IsWebBootstrapper>False</IsWebBootstrapper>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <PublishUrl>publish\</PublishUrl>
+ <InstallUrl />
+ <TargetCulture>en</TargetCulture>
+ <ApplicationVersion>1.0.0.1</ApplicationVersion>
+ <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
+ <UpdateEnabled>true</UpdateEnabled>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>days</UpdateIntervalUnits>
+ <ProductName>GithubForOutlook</ProductName>
+ <PublisherName />
+ <SupportUrl />
+ <FriendlyName>GithubForOutlook</FriendlyName>
+ <OfficeApplicationDescription />
+ <LoadBehavior>3</LoadBehavior>
</PropertyGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
@@ -41,9 +54,14 @@
<ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.VSTORuntime.4.0">
- <Visible>false</Visible>
- <ProductName>Microsoft Visual Studio 2010 Tools for Office Runtime %28x86 and x64%29</ProductName>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
@@ -153,11 +171,13 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
- <Reference Include="VSTOContrib.Core, Version=0.9.0.67, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\VSTOContrib.Outlook.0.9.0.67\tools\net40\2010\VSTOContrib.Core.dll</HintPath>
+ <Reference Include="VSTOContrib.Core, Version=0.10.0.73, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\VSTOContrib.Outlook.0.10.0.73\tools\net40\2010\VSTOContrib.Core.dll</HintPath>
</Reference>
- <Reference Include="VSTOContrib.Outlook, Version=0.9.0.67, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\VSTOContrib.Outlook.0.9.0.67\tools\net40\2010\VSTOContrib.Outlook.dll</HintPath>
+ <Reference Include="VSTOContrib.Outlook, Version=0.10.0.73, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\VSTOContrib.Outlook.0.10.0.73\tools\net40\2010\VSTOContrib.Outlook.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
@@ -253,8 +273,8 @@
<VisualStudio>
<FlavorProperties GUID="{BAA0C2D2-18E2-41B9-852F-F413020CAA33}">
<ProjectProperties HostName="Outlook" HostPackage="{20A848B8-E01F-4801-962E-25DB0FF57389}" OfficeVersion="14.0" VstxVersion="4.0" ApplicationType="Outlook" Language="cs" TemplatesPath="" DebugInfoExeName="#Software\Microsoft\Office\14.0\Outlook\InstallRoot\Path#outlook.exe" AddItemTemplatesGuid="{A58A78EB-1C92-4DDD-80CF-E8BD872ABFC4}" />
- <Host Name="Outlook" GeneratedCodeNamespace="GithubForOutlook" IconIndex="0">
- <HostItem Name="ThisAddIn" Code="ThisAddIn.cs" CanonicalName="AddIn" CanActivate="false" IconIndex="1" Blueprint="ThisAddIn.Designer.xml" GeneratedCode="ThisAddIn.Designer.cs" />
+ <Host Name="Outlook" GeneratedCodeNamespace="GithubForOutlook" PublishedHash="69C324AB27932AA2FBF2B7EA72250886FF164DE6" IconIndex="0">
+ <HostItem Name="ThisAddIn" Code="ThisAddIn.cs" CanonicalName="AddIn" PublishedHash="88D7B013B3808662AE0494C8EC78A0EDC8B71644" CanActivate="false" IconIndex="1" Blueprint="ThisAddIn.Designer.xml" GeneratedCode="ThisAddIn.Designer.cs" />
</Host>
</FlavorProperties>
</VisualStudio>
View
2  src/GithubForOutlook/packages.config
@@ -3,5 +3,5 @@
<package id="Newtonsoft.Json" version="4.0.8" />
<package id="NGitHub" version="1.0.0.11" />
<package id="RestSharp" version="102.7" />
- <package id="VSTOContrib.Outlook" version="0.9.0.67" />
+ <package id="VSTOContrib.Outlook" version="0.10.0.73" />
</packages>
Please sign in to comment.
Something went wrong with that request. Please try again.