Skip to content

Commit e197c96

Browse files
authored
Merge branch 'next' into moveCloserToUsageBug
2 parents 9519c58 + 6adc111 commit e197c96

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

RetailCoder.VBE/NLog.dll.nlog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<target
77
xsi:type="File"
88
name="file"
9-
fileName="${specialfolder:folder=ApplicationData}/Rubberduck/logs/rubberduck.log"
9+
fileName="${specialfolder:folder=ApplicationData}/Rubberduck/Logs/RubberduckLog.txt"
1010
layout="${longdate};${uppercase:${level}};${logger};${message};${exception:format=tostring}"
11-
archiveFileName="${specialfolder:folder=ApplicationData}/Rubberduck/logs/archives/rubberduck.{#}.log"
11+
archiveFileName="${specialfolder:folder=ApplicationData}/Rubberduck/Logs/archives/RubberduckLog.{#}.txt"
1212
archiveAboveSize="5242880"
1313
archiveNumbering="Sequence"
1414
concurrentWrites="true"

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects
228228
get { return _projects; }
229229
set
230230
{
231+
ReorderChildNodes(value);
231232
_projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));
232-
233-
ReorderChildNodes(_projects);
233+
234234
OnPropertyChanged();
235235
}
236236
}

RetailCoder.VBE/UI/RegexAssistant/RegexAssistant.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<TextBox HorizontalAlignment="Stretch"
7171
VerticalAlignment="Top" Height="23"
7272
VerticalContentAlignment="Center" Margin="5"
73-
Text="{Binding Pattern}"/>
73+
Text="{Binding Pattern, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
7474

7575
<StackPanel Orientation="Horizontal" Margin="5,0,5,0">
7676
<CheckBox Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_GlobalFlag}"

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1716,7 +1716,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
17161716
<value>Publish Existing Repository</value>
17171717
</data>
17181718
<data name="RubberduckFatalError" xml:space="preserve">
1719-
<value>Rubberduck encountered an error. Please save your work and restart the host program, then upload your log file to our GitHub page.</value>
1719+
<value>Rubberduck encountered an error. Please save your work and restart the host program, then upload your log file located at "C:\Users\{username}\AppData\Roaming\Rubberduck\Logs\RubberduckLog.txt" to a GitHub issue at "https://github.com/rubberduck-vba/Rubberduck/issues/new".</value>
17201720
</data>
17211721
<data name="TestExplorerMenu_AddExpectedErrorTestMethod" xml:space="preserve">
17221722
<value>Test Method (&amp;Expected Error)</value>

0 commit comments

Comments
 (0)