Skip to content

Commit f7f5063

Browse files
committed
Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into next
2 parents 0bacf49 + c534f26 commit f7f5063

18 files changed

+3816
-3209
lines changed

RetailCoder.VBE/Common/RubberduckHooks.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@ public void Detach()
188188

189189
private void hook_MessageReceived(object sender, HookEventArgs e)
190190
{
191+
var active = User32.GetForegroundWindow();
192+
if (active != _mainWindowHandle)
193+
{
194+
return;
195+
}
196+
191197
var hotkey = sender as IHotkey;
192198
if (hotkey != null)
193199
{

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,13 @@ public void RemoveChildren()
8686
{
8787
foreach (var child in _items.Keys.Select(item => item as IParentMenuItem).Where(child => child != null))
8888
{
89-
Debug.WriteLine("Deleting menu item {0}.", child.Caption);
9089
child.RemoveChildren();
9190
Debug.Assert(_items[child] is CommandBarPopup);
9291
(_items[child] as CommandBarPopup).Delete();
9392
}
9493
foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
9594
{
9695
child.Click -= child_Click;
97-
Debug.WriteLine("Deleting child menu item {0}.", child.Caption);
9896
child.Delete();
9997
}
10098
}

RetailCoder.VBE/UI/RubberduckUI.de.resx

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<root>
33
<!--
44
Microsoft ResX Schema
@@ -59,7 +59,7 @@
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->
62-
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
6363
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
6464
<xsd:element name="root" msdata:IsDataSet="true">
6565
<xsd:complexType>
@@ -1582,13 +1582,25 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
15821582
<data name="GeneralSettings_ShowLogFolder" xml:space="preserve">
15831583
<value>Logging-Ordner anzeigen</value>
15841584
</data>
1585-
<data name="information">
1585+
<data name="information" xml:space="preserve">
15861586
<value />
15871587
</data>
1588-
<data name="CodeExplorer_CopyToolTip">
1588+
<data name="CodeExplorer_CopyToolTip" xml:space="preserve">
15891589
<value>In Zwischenablage kopieren</value>
15901590
</data>
1591-
<data name="cross_circle">
1591+
<data name="cross_circle" xml:space="preserve">
15921592
<value />
15931593
</data>
1594+
<data name="SourceControl_PublishRepo_FailureTitle" xml:space="preserve">
1595+
<value>Veröffentliche Repository</value>
1596+
</data>
1597+
<data name="SourceControl_PublishRepoButtonToolTip" xml:space="preserve">
1598+
<value>Veröffentliche Repository auf Github</value>
1599+
</data>
1600+
<data name="SourceControl_PublishRepo_NoOpenRepo" xml:space="preserve">
1601+
<value>Kein geöffnetes Repository verfügbar, um es auf den Remote-Pfad zu veröffentlichen</value>
1602+
</data>
1603+
<data name="SourceControl_ExternalModifications" xml:space="preserve">
1604+
<value>Eine Quelldatei wurde außerhalb des VBA-Editors geändert. Soll Rubberduck diese nachladen?</value>
1605+
</data>
15941606
</root>

0 commit comments

Comments
 (0)