Skip to content

sync with main repo #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 2, 2016
Merged

sync with main repo #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ec655e
Adjusted German .resx for RubberduckUI
Vogel612 Jul 1, 2016
91f00b6
Merge pull request #1949 from Vogel612/i18n_maintenance
Hosch250 Jul 1, 2016
b0c4535
Handle sink events better to prevent crashes
Hosch250 Jul 1, 2016
83f73c5
Log start-up exceptions
Hosch250 Jul 1, 2016
8407fd5
Merge branch 'next' into codeExplorerBugs
Hosch250 Jul 1, 2016
41892a6
Fix setting the project ID for the tests
Hosch250 Jul 1, 2016
726a1ba
Merge branch 'codeExplorerBugs' of https://github.com/Hosch250/Rubber…
Hosch250 Jul 1, 2016
4e274ef
Merge pull request #1951 from Hosch250/codeExplorerBugs
Hosch250 Jul 1, 2016
bf43120
Remove Aero2 to maintain Windows 7 compatibility. Closes #1954
comintern Jul 2, 2016
641a09d
Merge pull request #1956 from comintern/next
Hosch250 Jul 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions RetailCoder.VBE/Common/Dispatch/DispatcherEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using Rubberduck.Parsing;

namespace Rubberduck.Common.Dispatch
{
public class DispatcherEventArgs<T> : EventArgs, IDispatcherEventArgs<T>
public class DispatcherEventArgs<T> : EventArgs
where T : class
{
private readonly T _item;
Expand Down
6 changes: 2 additions & 4 deletions RetailCoder.VBE/Common/Dispatch/DispatcherRenamedEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Rubberduck.Parsing;

namespace Rubberduck.Common.Dispatch
namespace Rubberduck.Common.Dispatch
{
public class DispatcherRenamedEventArgs<T> : DispatcherEventArgs<T>, IDispatcherRenamedEventArgs<T>
public class DispatcherRenamedEventArgs<T> : DispatcherEventArgs<T>
where T : class
{
private readonly string _oldName;
Expand Down
3 changes: 3 additions & 0 deletions RetailCoder.VBE/Extension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Ninject.Extensions.Interception;
using NLog;

namespace Rubberduck
{
Expand All @@ -26,6 +27,7 @@ public class _Extension : IDTExtensibility2

private IKernel _kernel;
private App _app;
private readonly Logger _logger = LogManager.GetCurrentClassLogger();

public void OnAddInsUpdate(ref Array custom)
{
Expand All @@ -50,6 +52,7 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
}
catch (Exception exception)
{
_logger.Fatal(exception);
System.Windows.Forms.MessageBox.Show(exception.ToString(), RubberduckUI.RubberduckLoadFailure, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
Expand Down
1 change: 0 additions & 1 deletion RetailCoder.VBE/Rubberduck.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="PresentationFramework.Aero" />
<Reference Include="PresentationFramework.Aero2" />
<Reference Include="ReachFramework" />
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>False</EmbedInteropTypes>
Expand Down
Loading