Skip to content
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

Jump to bottom

(GH-2384) Subsequent changes after #3552 Update resource names #3557

Merged
merged 22 commits into from
Jul 22, 2019
Merged

(GH-2384) Subsequent changes after #3552 Update resource names #3557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
54384e5
Rename MahApps.Styles.ButtonBase.MetroCircle into MahApps.Styles.Butt…
punker76 Jul 22, 2019
120607e
Rename MahApps.Styles.Button.MetroWindowClose.XYZ into MahApps.Styles…
punker76 Jul 22, 2019
712e584
Fix naming of MahApps.Styles.MetroThumb.RangeSlider.XYZ
punker76 Jul 22, 2019
af2e0b5
Rename MahApps.Styles.Button.Window.Standard.VisualStudio into MahApp…
punker76 Jul 22, 2019
fe1fee1
Rename MahApps.Styles.Button.Window.Link.VisualStudio into MahApps.St…
punker76 Jul 22, 2019
7aef125
Introduce MahApps.Styles.ListBoxItem.Standard.VisualStudio
punker76 Jul 22, 2019
297fde3
Rename .Standard.VisualStudio into .VisualStudio only
punker76 Jul 22, 2019
c63a73b
Fix overriding MahApps.Storyboard.MetroExpanderCollapse
punker76 Jul 22, 2019
ea61012
Rename MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle into Ma…
punker76 Jul 22, 2019
d75713e
Rename MahApps.Styles.ButtonBase.Metro into MahApps.Styles.ButtonBase
punker76 Jul 22, 2019
8227a4b
Rename MahApps.Storyboard.MetroExpanderExpand into MahApps.Storyboard…
punker76 Jul 22, 2019
13b992a
Rename MahApps.Storyboard.MetroExpanderCollapse into MahApps.Storyboa…
punker76 Jul 22, 2019
f75cd1a
Rename MahApps.Storyboard.MetroScrollBarThumbMouseOver into MahApps.S…
punker76 Jul 22, 2019
4a80062
Rename MahApps.Storyboard.MetroScrollBarThumbPressed into MahApps.Sto…
punker76 Jul 22, 2019
77fe7fe
Rename MahApps.Styles.ButtonBase.DialogsAccent into MahApps.Styles.Bu…
punker76 Jul 22, 2019
365e215
Rename MahApps.Styles.ButtonBase.DialogsAccentHighlight into MahApps.…
punker76 Jul 22, 2019
4d7d9dd
Rename MahApps.Styles.ButtonBase.FocusVisualStyle.Circle into MahApps…
punker76 Jul 22, 2019
3107b5d
Rename MahApps.Styles.ButtonBase.Circle into MahApps.Styles.Button.Ci…
punker76 Jul 22, 2019
5fe7feb
Rename MahApps.Templates.ButtonBase.Chromeless into MahApps.Templates…
punker76 Jul 22, 2019
81268f4
Rename MahApps.Styles.ButtonBase.Chromeless into MahApps.Styles.Butto…
punker76 Jul 22, 2019
4daa04c
Rename MahApps.Styles.ButtonBase into MahApps.Styles.Button
punker76 Jul 22, 2019
afaff04
Fix using scrollbar repeat button sizes broken by search and replace
punker76 Jul 22, 2019
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
2 changes: 1 addition & 1 deletion src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Height="36"
FontFamily="Segoe UI Symbol"
FontSize="16"
Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
Style="{DynamicResource MahApps.Styles.Button.Circle}">
<iconPacks:PackIconModern Kind="Add" />
</Button>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
FontFamily="Segoe UI Symbol"
FontSize="16"
Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
Style="{DynamicResource MahApps.Styles.Button.Circle}">
<iconPacks:PackIconModern Kind="Add" />
</Button>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</Style>

<!-- quick change of the collapse storyboard duration -->
<Storyboard x:Key="MetroExpanderCollapseStoryboard">
<Storyboard x:Key="MahApps.Storyboard.ExpanderCollapse">
<DoubleAnimation Storyboard.TargetName="ExpandSite"
Storyboard.TargetProperty="(UIElement.Opacity)"
To="0"
Expand Down
14 changes: 7 additions & 7 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@
<Button Width="100"
Margin="{StaticResource ControlMargin}"
Content="Enabled"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
<Button Width="100"
Margin="{StaticResource ControlMargin}"
Content="Enabled"
Style="{DynamicResource MahApps.Styles.ButtonBase.AccentedSquare}" />
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" />
<Button Width="100"
Margin="{StaticResource ControlMargin}"
Content="Disabled"
IsEnabled="False"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
<Button Width="100"
Margin="{StaticResource ControlMargin}"
Content="Disabled"
IsEnabled="False"
Style="{DynamicResource MahApps.Styles.ButtonBase.AccentedSquare}" />
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" />
</StackPanel>

<StackPanel Grid.Row="0" Grid.Column="2">
Expand Down Expand Up @@ -144,7 +144,7 @@
Orientation="Horizontal">
<StackPanel.Resources>
<Style x:Key="AccentCircleButtonStyle"
BasedOn="{StaticResource MahApps.Styles.ButtonBase.MetroCircle}"
BasedOn="{StaticResource MahApps.Styles.Button.Circle}"
TargetType="{x:Type ButtonBase}">
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
<Style.Triggers>
Expand Down Expand Up @@ -179,7 +179,7 @@
Margin="4"
Foreground="{DynamicResource MahApps.Brushes.Accent}"
IsEnabled="False"
Style="{StaticResource MahApps.Styles.ButtonBase.MetroCircle}">
Style="{StaticResource MahApps.Styles.Button.Circle}">
<Button.ContentTemplate>
<DataTemplate>
<iconPacks:PackIconModern Width="20"
Expand Down Expand Up @@ -318,7 +318,7 @@
TargetType="Controls:DropDownButton">
<Setter Property="ArrowVisibility" Value="Collapsed" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}" />
<Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.Button.Circle}" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}" />
<Setter Property="Height" Value="48" />
<Setter Property="Width" Value="48" />
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
Columns="2">
<Button Margin="10"
Content="Create"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
<Button Margin="10"
Content="Cancel"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
</UniformGrid>

</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
<Button Margin="10"
Click="CloseFlyoutClick"
Content="OK"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
<Button Margin="10"
Click="CloseFlyoutClick"
Content="Cancel"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
</UniformGrid>
</Grid>
</Controls:Flyout>
12 changes: 6 additions & 6 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@
Columns="2">
<Button Margin="10"
Content="Create"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
<Button Margin="10"
Content="Cancel"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
</UniformGrid>
</Grid>
</Controls:Flyout>
Expand Down Expand Up @@ -228,11 +228,11 @@
<Button Margin="10"
Click="ShowSettingsLeft"
Content="Left"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
<Button Margin="10"
Click="ShowSettingsRight"
Content="Right"
Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
Style="{DynamicResource MahApps.Styles.Button.Square}" />
</UniformGrid>
</Grid>
</Controls:Flyout>
Expand Down Expand Up @@ -291,7 +291,7 @@
Orientation="Horizontal">
<Button Width="36"
Height="36"
Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
Style="{DynamicResource MahApps.Styles.Button.Circle}">
<iconPacks:PackIconModern Kind="Alert" />
</Button>
</StackPanel>
Expand All @@ -306,7 +306,7 @@
Height="36"
FontFamily="Segoe UI Symbol"
FontSize="16"
Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
Style="{DynamicResource MahApps.Styles.Button.Circle}">
<iconPacks:PackIconModern Kind="Add" />
</Button>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
FontSize="16"
Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}, Path=Foreground}"
IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonIsCancel}"
Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}"
Style="{DynamicResource MahApps.Styles.Button.Circle}"
Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonVisibility}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
Expand Down
8 changes: 4 additions & 4 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,11 +424,11 @@
<Button Margin="0 10 0 3"
Content="Fire rocket..."
FontSize="14"
Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
<Button Margin="0 3 0 10"
Content="Throw something over board..."
FontSize="14"
Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
<Separator Background="#11FFFFFF" />
<TextBlock Margin="0 10 0 10"
FontSize="18"
Expand All @@ -438,11 +438,11 @@
<Button Margin="0 10 0 3"
Content="blastallenemies.cmd"
FontSize="14"
Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
<Button Margin="0 3 0 3"
Content="verysecretmessage.txt"
FontSize="14"
Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
</StackPanel>
</Grid>
</DockPanel>
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<Button x:Name="PART_AffirmativeButton"
Margin="0 0 5 0"
Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}" />
Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}" />
<Button x:Name="PART_NegativeButton"
Margin="5 0 5 0"
Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ protected override void OnLoaded()
switch (this.DialogSettings.ColorScheme)
{
case MetroDialogColorScheme.Accented:
this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.ButtonBase.DialogsAccentHighlight");
this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.Button.Dialogs.AccentHighlight");
this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
this.PART_TextBox.SetResourceReference(ControlsHelper.FocusBorderBrushProperty, "MahApps.Brushes.TextBox.FocusBorder");
break;
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<Button x:Name="PART_AffirmativeButton"
Margin="0 0 5 0"
Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}" />
Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}" />
<Button x:Name="PART_NegativeButton"
Margin="5 0 5 0"
Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ protected override void OnLoaded()
switch (this.DialogSettings.ColorScheme)
{
case MetroDialogColorScheme.Accented:
this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.ButtonBase.DialogsAccentHighlight");
this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.Button.Dialogs.AccentHighlight");
this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
this.PART_TextBox2.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
break;
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace MahApps.Metro.Controls.Dialogs
/// </summary>
public partial class MessageDialog : BaseMetroDialog
{
private const string ACCENT_BUTTON_STYLE = "MahApps.Styles.ButtonBase.DialogsAccent";
private const string ACCENT_HIGHLIGHT_BUTTON_STYLE = "MahApps.Styles.ButtonBase.DialogsAccentHighlight";
private const string ACCENT_BUTTON_STYLE = "MahApps.Styles.Button.Dialogs.Accent";
private const string ACCENT_HIGHLIGHT_BUTTON_STYLE = "MahApps.Styles.Button.Dialogs.AccentHighlight";

/// <summary>Identifies the <see cref="Message"/> dependency property.</summary>
public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(nameof(Message), typeof(string), typeof(MessageDialog), new PropertyMetadata(default(string)));
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Margin="5 0 0 0"
Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow"
Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}"
Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}"
Visibility="Hidden" />
</StackPanel>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Height="34"
Margin="4 2 2 2"
VerticalAlignment="Center"
Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
Style="{DynamicResource MahApps.Styles.Button.Circle}">
<ContentControl Width="20"
Height="20"
Content="M57,42V34H32.25L42.25,24H31.75L17.75,38L31.75,52H42.25L32.25,42H57Z"
Expand All @@ -28,7 +28,7 @@
Margin="2 2 4 2"
VerticalAlignment="Center"
IsEnabled="False"
Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
Style="{DynamicResource MahApps.Styles.Button.Circle}">
<ContentControl Width="20"
Height="20"
Content="M19,34V42H43.75L33.75,52H44.25L58.25,38L44.25,24H33.75L43.75,34H19Z"
Expand Down
Loading