Skip to content

Commit 5986308

Browse files
MDoernerMDoerner
committed
Merge branch 'next' into ReorganizingRewriting2
2 parents 299e08a + f79d6d5 commit 5986308

File tree

24 files changed

+52
-117
lines changed

24 files changed

+52
-117
lines changed

‎Rubberduck.API/Rubberduck.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
33
<PropertyGroup>
44
<Product>Rubberduck.API</Product>
55
<Description>Rubberduck Reflection API</Description>

‎Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
33
<PropertyGroup>
44
<Product>Rubberduck.CodeAnalysis</Product>
55
<Description>Assembly Containing the Code Analysis features exposed by Rubberduck</Description>

‎Rubberduck.Core/Properties/Settings.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Rubberduck.Core/Rubberduck.Core.csproj

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
33
<PropertyGroup>
44
<RootNamespace>Rubberduck</RootNamespace>
55
<AssemblyName>Rubberduck.Core</AssemblyName>
@@ -81,55 +81,4 @@
8181
<Version>2.0.20525</Version>
8282
</PackageReference>
8383
</ItemGroup>
84-
85-
<!-- BEGIN WINDOWS FORMS WORKAROUND SECTION -->
86-
<ItemGroup>
87-
<Compile Update="**\*Window.cs" SubType="Form" />
88-
<Compile Update="**\*Dialog.cs" SubType="Form" />
89-
<Compile Update="**\SettingsForm.cs" SubType="Form" />
90-
<Compile Update="**\SimpleListControl.cs" SubType="Form" />
91-
<Compile Update="**\Splash.cs" SubType="Form" />
92-
<Compile Update="**\*.Designer.cs">
93-
<DependentUpon>$([System.String]::Copy('%(Filename)').Replace('.Designer', '')).cs</DependentUpon>
94-
</Compile>
95-
<EmbeddedResource Update="UI\**\*.resx">
96-
<DependentUpon>%(Filename).cs</DependentUpon>
97-
</EmbeddedResource>
98-
</ItemGroup>
99-
<!-- END WINDOWS FORMS WORKAROUND SECTION -->
100-
101-
<!--BEGIN XAML WORKAROUND SECTION -->
102-
<ItemGroup>
103-
<Page Include="**\*.xaml">
104-
<SubType>Designer</SubType>
105-
<Generator>MSBuild:Compile</Generator>
106-
</Page>
107-
<Compile Update="**\*.xaml.cs">
108-
<SubType>Code</SubType>
109-
<DependentUpon>%(Filename)</DependentUpon>
110-
</Compile>
111-
<!-- Resources -->
112-
<Compile Update="Properties\Resources.Designer.cs">
113-
<DependentUpon>Resources.resx</DependentUpon>
114-
<AutoGen>true</AutoGen>
115-
<DesignTime>true</DesignTime>
116-
</Compile>
117-
<EmbeddedResource Update="Properties\Resources.resx">
118-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
119-
<Generator>ResXFileCodeGenerator</Generator>
120-
</EmbeddedResource>
121-
<!-- Settings -->
122-
<Compile Update="Properties\Settings.Designer.cs">
123-
<AutoGen>True</AutoGen>
124-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
125-
<DependentUpon>Settings.settings</DependentUpon>
126-
<DesignTime>True</DesignTime>
127-
</Compile>
128-
<None Include="Properties\Settings.settings">
129-
<Generator>SettingsSingleFileGenerator</Generator>
130-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
131-
</None>
132-
</ItemGroup>
133-
<!-- END XAML WORKAROUND SECTION -->
134-
13584
</Project>

‎Rubberduck.Core/UI/Controls/NumberPicker.xaml.cs

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.ComponentModel;
1+
using System;
2+
using System.ComponentModel;
23
using System.Windows;
34

45
// credit to http://stackoverflow.com/a/2752538
@@ -11,6 +12,10 @@ public partial class NumberPicker : IDataErrorInfo
1112
{
1213
public static readonly DependencyProperty NumValueProperty =
1314
DependencyProperty.Register("NumValue", typeof(int), typeof(NumberPicker), new UIPropertyMetadata(null));
15+
public static readonly DependencyProperty MinNumberProperty =
16+
DependencyProperty.Register("MinNumber", typeof(int), typeof(NumberPicker), new UIPropertyMetadata(null));
17+
public static readonly DependencyProperty MaxNumberProperty =
18+
DependencyProperty.Register("MaxNumber", typeof(int), typeof(NumberPicker), new UIPropertyMetadata(null));
1419

1520
public int NumValue
1621
{
@@ -22,9 +27,27 @@ public int NumValue
2227
}
2328
}
2429

25-
public int MinNumber { get; set; } = int.MinValue;
30+
public int MinNumber
31+
{
32+
get => (int)GetValue(MinNumberProperty);
33+
set
34+
{
35+
var old = GetValue(MinNumberProperty);
36+
SetValue(MinNumberProperty, value);
37+
OnPropertyChanged(new DependencyPropertyChangedEventArgs(MinNumberProperty, old, value));
38+
}
39+
}
2640

27-
public int MaxNumber { get; set; } = int.MaxValue;
41+
public int MaxNumber
42+
{
43+
get => (int)GetValue(MaxNumberProperty);
44+
set
45+
{
46+
var old = GetValue(MaxNumberProperty);
47+
SetValue(MaxNumberProperty, value);
48+
OnPropertyChanged(new DependencyPropertyChangedEventArgs(MaxNumberProperty, old, value));
49+
}
50+
}
2851

2952
public NumberPicker()
3053
{

‎Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
IsChecked="{Binding ConcatVbNewLine}"
112112
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=ConcatVbNewLine}" />
113113

114-
<Label Margin="15,0,15,0" Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=ConcatMaxLines}" />
114+
<Label Margin="15,0,15,0" Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=MaxConcatLines}" />
115115
<controls:NumberPicker Margin="15,0,15,0"
116116
NumValue="{Binding ConcatMaxLines}"
117117
MinNumber="{Binding ConcatMaxLinesMinValue}"

‎Rubberduck.Deployment/Rubberduck.Deployment.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
33
<PropertyGroup>
44
<Product>Rubberduck.Deployment</Product>
55
<Copyright>Copyright © 2018</Copyright>

‎Rubberduck.Interaction/Rubberduck.Interaction.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
33
<PropertyGroup>
44
<Copyright>Copyright © 2018</Copyright>
55
<Product>Rubberduck.Interaction</Product>

‎Rubberduck.Main/Rubberduck.Main.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
33
<PropertyGroup>
44
<RootNamespace>Rubberduck</RootNamespace>
55
<AssemblyName>Rubberduck</AssemblyName>

‎Rubberduck.Parsing/Rubberduck.Parsing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
33
<PropertyGroup>
44
<AssemblyName>Rubberduck.Parsing</AssemblyName>
55
<Title>Rubberduck.Parsing</Title>

0 commit comments

Comments
 (0)