Skip to content

Commit b51b24f

Browse files
ButchersBoyButchersBoy
committed
rename objects to Assist. prep for beta
1 parent 5ea58a6 commit b51b24f

16 files changed

+83
-82
lines changed

‎MahMaterialDragablzMashUp/FlyoutContent.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ResourceDictionary>
1616
</UserControl.Resources>
1717
<StackPanel Margin="24">
18-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" FontSize="18" wpf:TextField.Hint="Your Name" MinWidth="120" />
19-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" wpf:TextField.Hint="Location" MinWidth="120" Margin="0 8 0 0" />
18+
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" FontSize="18" wpf:TextFieldAssist.Hint="Your Name" MinWidth="120" />
19+
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" wpf:TextFieldAssist.Hint="Location" MinWidth="120" Margin="0 8 0 0" />
2020
</StackPanel>
2121
</UserControl>

‎MahMaterialDragablzMashUp/TextFields.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</Viewbox>
5959
<TextBox Grid.Row="0" Grid.Column="1"
6060
x:Name="NameTextBox"
61-
wpf:TextField.Hint="Name">
61+
wpf:TextFieldAssist.Hint="Name">
6262
<TextBox.Text>
6363
<Binding Path="Name" UpdateSourceTrigger="PropertyChanged">
6464
<Binding.ValidationRules>
@@ -77,10 +77,10 @@
7777
</Viewbox>
7878
<TextBox Grid.Row="1" Grid.Column="1"
7979
x:Name="PhoneTextBox"
80-
wpf:TextField.Hint="Phone"
80+
wpf:TextFieldAssist.Hint="Phone"
8181
/>
8282
<TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="16 0 8 0">Fruit</TextBlock>
83-
<ComboBox Grid.Row="1" Grid.Column="3" wpf:TextField.Hint="OS" IsEditable="True">
83+
<ComboBox Grid.Row="1" Grid.Column="3" wpf:TextFieldAssist.Hint="OS" IsEditable="True">
8484
<ComboBoxItem>Apple</ComboBoxItem>
8585
<ComboBoxItem>Banana</ComboBoxItem>
8686
<ComboBoxItem>Pear</ComboBoxItem>
@@ -94,9 +94,9 @@
9494
</Viewbox>
9595
<TextBox Grid.Row="2" Grid.Column="1"
9696
x:Name="CommentTextBox"
97-
wpf:TextField.Hint="Comment"
97+
wpf:TextFieldAssist.Hint="Comment"
9898
/>
99-
<ComboBox Grid.Row="2" Grid.Column="3" wpf:TextField.Hint="OS">
99+
<ComboBox Grid.Row="2" Grid.Column="3" wpf:TextFieldAssist.Hint="OS">
100100
<ComboBoxItem>Andoid</ComboBoxItem>
101101
<ComboBoxItem>iOS</ComboBoxItem>
102102
<ComboBoxItem>Linux</ComboBoxItem>

‎MaterialDesignColors.WpfExample/ColorZoneWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</Canvas>
6161
</Viewbox>
6262
</Button>
63-
<TextBox Grid.Column="1" Margin="8 0 0 0" wpf:TextField.Hint="Build a search bar" MinWidth="200" VerticalAlignment="Center" />
63+
<TextBox Grid.Column="1" Margin="8 0 0 0" wpf:TextFieldAssist.Hint="Build a search bar" MinWidth="200" VerticalAlignment="Center" />
6464
<Button Style="{DynamicResource MaterialDesignToolButton}" Grid.Column="2">
6565
<Viewbox Width="16" Height="16" Margin="8 0 0 0" Opacity=".56">
6666
<Canvas Width="24" Height="24">

‎MaterialDesignColors.WpfExample/TextFields.xaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</Viewbox>
6262
<TextBox Grid.Row="0" Grid.Column="1"
6363
x:Name="NameTextBox"
64-
wpf:TextField.Hint="Name">
64+
wpf:TextFieldAssist.Hint="Name">
6565
<TextBox.Text>
6666
<Binding Path="Name" UpdateSourceTrigger="PropertyChanged">
6767
<Binding.ValidationRules>
@@ -71,14 +71,14 @@
7171
</TextBox.Text>
7272
</TextBox>
7373
<TextBlock Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" Margin="16 0 8 0">OS</TextBlock>
74-
<ComboBox Grid.Row="0" Grid.Column="3" wpf:TextField.Hint="OS">
74+
<ComboBox Grid.Row="0" Grid.Column="3" wpf:TextFieldAssist.Hint="OS">
7575
<ComboBoxItem>Andoid</ComboBoxItem>
7676
<ComboBoxItem>iOS</ComboBoxItem>
7777
<ComboBoxItem>Linux</ComboBoxItem>
7878
<ComboBoxItem>Windows</ComboBoxItem>
7979
</ComboBox>
8080
<TextBox Grid.Row="0" Grid.RowSpan="3" Grid.Column="4" TextWrapping="Wrap" VerticalAlignment="Stretch" Margin="16 0 0 0"
81-
wpf:TextField.Hint="Multiline text">Multiline. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</TextBox>
81+
wpf:TextFieldAssist.Hint="Multiline text">Multiline. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</TextBox>
8282
<Viewbox Grid.Row="1" Grid.Column="0">
8383
<Canvas Width="24" Height="24">
8484
<Path Data="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0 0,1 21,16.5V20A1,1 0 0,1 20,21A17,17 0 0,1 3,4A1,1 0 0,1 4,3H7.5A1,1 0 0,1 8.5,4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z"
@@ -87,10 +87,10 @@
8787
</Viewbox>
8888
<TextBox Grid.Row="1" Grid.Column="1"
8989
x:Name="PhoneTextBox"
90-
wpf:TextField.Hint="Phone"
90+
wpf:TextFieldAssist.Hint="Phone"
9191
/>
9292
<TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="16 0 8 0">Fruit</TextBlock>
93-
<ComboBox Grid.Row="1" Grid.Column="3" wpf:TextField.Hint="Search" IsEditable="True" wpf:TextField.HintOpacity=".5">
93+
<ComboBox Grid.Row="1" Grid.Column="3" wpf:TextFieldAssist.Hint="Search" IsEditable="True" wpf:TextFieldAssist.HintOpacity=".5">
9494
<ComboBoxItem>Apple</ComboBoxItem>
9595
<ComboBoxItem>Banana</ComboBoxItem>
9696
<ComboBoxItem>Pear</ComboBoxItem>
@@ -104,7 +104,7 @@
104104
</Viewbox>
105105
<TextBox Grid.Row="2" Grid.Column="1"
106106
x:Name="CommentTextBox"
107-
wpf:TextField.Hint="Comment"
107+
wpf:TextFieldAssist.Hint="Comment"
108108
/>
109109
<Viewbox Grid.Row="2" Grid.Column="2">
110110
<Canvas Width="24" Height="24">
@@ -114,21 +114,21 @@
114114
</Viewbox>
115115
<PasswordBox Grid.Row="2" Grid.Column="3"
116116
x:Name="PasswordBox"
117-
wpf:TextField.Hint="Password" />
117+
wpf:TextFieldAssist.Hint="Password" />
118118

119-
<TextBox Grid.Row="3" Grid.Column="1" wpf:TextField.Hint="Floating Hint" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
119+
<TextBox Grid.Row="3" Grid.Column="1" wpf:TextFieldAssist.Hint="Floating Hint" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
120120
Margin="0 8 0 8"/>
121-
<ComboBox Grid.Row="3" Grid.Column="3" wpf:TextField.Hint="OS" Style="{StaticResource MaterialDesignFloatingHintComboBox}"
121+
<ComboBox Grid.Row="3" Grid.Column="3" wpf:TextFieldAssist.Hint="OS" Style="{StaticResource MaterialDesignFloatingHintComboBox}"
122122
Margin="0 8 0 8">
123123
<ComboBoxItem>Andoid</ComboBoxItem>
124124
<ComboBoxItem>iOS</ComboBoxItem>
125125
<ComboBoxItem>Linux</ComboBoxItem>
126126
<ComboBoxItem>Windows</ComboBoxItem>
127127
</ComboBox>
128128

129-
<TextBox Grid.Row="4" Grid.Column="1" wpf:TextField.Hint="Floating Hint" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Text="Good stuff"
129+
<TextBox Grid.Row="4" Grid.Column="1" wpf:TextFieldAssist.Hint="Floating Hint" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Text="Good stuff"
130130
Margin="0 8 0 8"/>
131-
<ComboBox Grid.Row="4" Grid.Column="3" wpf:TextField.Hint="Search" IsEditable="True" Style="{StaticResource MaterialDesignFloatingHintComboBox}"
131+
<ComboBox Grid.Row="4" Grid.Column="3" wpf:TextFieldAssist.Hint="Search" IsEditable="True" Style="{StaticResource MaterialDesignFloatingHintComboBox}"
132132
Margin="0 8 0 8">
133133
<ComboBoxItem>Apple</ComboBoxItem>
134134
<ComboBoxItem>Banana</ComboBoxItem>
@@ -137,10 +137,10 @@
137137
</ComboBox>
138138

139139
<DatePicker Grid.Row="5" Grid.Column="1" Width="100" HorizontalAlignment="Left" Margin="0 8 0 8"
140-
wpf:TextField.Hint="Pick Date"/>
140+
wpf:TextFieldAssist.Hint="Pick Date"/>
141141
<wpf:TimePicker Grid.Row="5" Grid.Column="3" VerticalAlignment="Top" Width="90" HorizontalAlignment="Left" Margin="0 8 0 8" />
142142
<wpf:TimePicker Grid.Row="5" Grid.Column="4" x:Name="PresetTimePicker" VerticalAlignment="Top" Width="90" HorizontalAlignment="Left" Margin="0 8 0 8"
143-
wpf:TextField.Hint="Custom hint" />
143+
wpf:TextFieldAssist.Hint="Custom hint" />
144144
<Slider Grid.Row="6" Grid.Column="1" TickFrequency="5" Orientation="Horizontal" Minimum="1" Maximum="50" Value="25" />
145145
<StackPanel Orientation="Horizontal" Grid.Row="6" Grid.Column="3" Grid.RowSpan="3" >
146146
<Slider TickFrequency="5" TickPlacement="BottomRight" Orientation="Vertical" Minimum="1" Maximum="50" />

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
<Compile Include="MaterialDataGridTextColumn.cs" />
207207
<Compile Include="MaterialDateDisplay.cs" />
208208
<Compile Include="PaletteHelper.cs" />
209-
<Compile Include="PasswordField.cs" />
209+
<Compile Include="PasswordFieldAssist.cs" />
210210
<Compile Include="ProgressLoop.cs" />
211211
<Compile Include="ProgressLoopDev.xaml.cs">
212212
<DependentUpon>ProgressLoopDev.xaml</DependentUpon>
@@ -224,7 +224,7 @@
224224
<DependentUpon>Settings.settings</DependentUpon>
225225
<DesignTimeSharedInput>True</DesignTimeSharedInput>
226226
</Compile>
227-
<Compile Include="TextField.cs" />
227+
<Compile Include="TextFieldAssist.cs" />
228228
<Compile Include="Converters\TextFieldHintVisibilityConverter.cs" />
229229
<Compile Include="TimePicker.cs" />
230230
<Compile Include="ToolTipAssist.cs" />

MaterialDesignThemes.Wpf/PasswordField.cs renamed to MaterialDesignThemes.Wpf/PasswordFieldAssist.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
namespace MaterialDesignThemes.Wpf
55
{
6-
public static class PasswordField
6+
public static class PasswordFieldAssist
77
{
88
public static readonly DependencyProperty ManagedProperty = DependencyProperty.RegisterAttached(
9-
"Managed", typeof(PasswordBox), typeof(PasswordField), new PropertyMetadata(default(PasswordBox), ManagedPropertyChangedCallback));
9+
"Managed", typeof(PasswordBox), typeof(PasswordFieldAssist), new PropertyMetadata(default(PasswordBox), ManagedPropertyChangedCallback));
1010

1111
private static void ManagedPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
1212
{
@@ -35,7 +35,7 @@ private static void ConfigureHint(PasswordBox passwordBox)
3535
}
3636

3737
public static readonly DependencyProperty HintVisibilityProperty = DependencyProperty.RegisterAttached(
38-
"HintVisibility", typeof(Visibility), typeof(PasswordField), new PropertyMetadata(default(Visibility)));
38+
"HintVisibility", typeof(Visibility), typeof(PasswordFieldAssist), new PropertyMetadata(default(Visibility)));
3939

4040
public static void SetHintVisibility(DependencyObject element, Visibility value)
4141
{

‎MaterialDesignThemes.Wpf/Properties/AssemblyInfo.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
// set of attributes. Change these attribute values to modify the information
99
// associated with an assembly.
1010
[assembly: AssemblyTitle("MaterialDesignThemes.Wpf")]
11-
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyDescription("Material Design in XAML Toolkit - WPF Themes")]
1212
[assembly: AssemblyConfiguration("")]
13-
[assembly: AssemblyCompany("")]
14-
[assembly: AssemblyProduct("MaterialDesignThemes.Wpf")]
15-
[assembly: AssemblyCopyright("Copyright © 2015")]
13+
[assembly: AssemblyCompany("Mulholland Software/James Willock")]
14+
[assembly: AssemblyProduct("MaterialDesignColors.Wpf")]
15+
[assembly: AssemblyCopyright("Copyright © 2015")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

19+
1920
// Setting ComVisible to false makes the types in this assembly not visible
2021
// to COM components. If you need to access a type in this assembly from
2122
// COM, set the ComVisible attribute to true on that type.
@@ -51,5 +52,4 @@
5152
// You can specify all the values or you can default the Build and Revision Numbers
5253
// by using the '*' as shown below:
5354
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.0.0")]
55-
[assembly: AssemblyFileVersion("1.0.0.0")]
55+
[assembly: AssemblyVersion("1.0.0.*")]

MaterialDesignThemes.Wpf/TextField.cs renamed to MaterialDesignThemes.Wpf/TextFieldAssist.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace MaterialDesignThemes.Wpf
99
/// <summary>
1010
/// The text field.
1111
/// </summary>
12-
public static class TextField
12+
public static class TextFieldAssist
1313
{
1414
#region Static Fields
1515

@@ -19,7 +19,7 @@ public static class TextField
1919
public static readonly DependencyProperty HintProperty = DependencyProperty.RegisterAttached(
2020
"Hint",
2121
typeof(string),
22-
typeof(TextField),
22+
typeof(TextFieldAssist),
2323
new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.Inherits));
2424

2525
/// <summary>
@@ -28,7 +28,7 @@ public static class TextField
2828
public static readonly DependencyProperty TextBoxViewMarginProperty = DependencyProperty.RegisterAttached(
2929
"TextBoxViewMargin",
3030
typeof(Thickness),
31-
typeof(TextField),
31+
typeof(TextFieldAssist),
3232
new PropertyMetadata(new Thickness(double.NegativeInfinity), TextBoxViewMarginPropertyChangedCallback));
3333

3434
/// <summary>
@@ -37,17 +37,17 @@ public static class TextField
3737
public static readonly DependencyProperty HintOpacityProperty = DependencyProperty.RegisterAttached(
3838
"HintOpacity",
3939
typeof(double),
40-
typeof(TextField),
40+
typeof(TextFieldAssist),
4141
new PropertyMetadata(.48, HintOpacityPropertyChangedCallback));
4242

4343
/// <summary>
4444
/// Internal framework use only.
4545
/// </summary>
4646
public static readonly DependencyProperty TextProperty = DependencyProperty.RegisterAttached(
47-
"Text", typeof (string), typeof (TextField), new PropertyMetadata(default(string), TextPropertyChangedCallback));
47+
"Text", typeof (string), typeof (TextFieldAssist), new PropertyMetadata(default(string), TextPropertyChangedCallback));
4848

4949
private static readonly DependencyPropertyKey IsNullOrEmptyPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
50-
"IsNullOrEmpty", typeof(bool), typeof(TextField), new PropertyMetadata(true));
50+
"IsNullOrEmpty", typeof(bool), typeof(TextFieldAssist), new PropertyMetadata(true));
5151

5252
public static readonly DependencyProperty IsNullOrEmptyProperty =
5353
IsNullOrEmptyPropertyKey.DependencyProperty;

0 commit comments

Comments
 (0)