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-3587) Last changes to Styles, Themes and Templates #3796

Merged
merged 49 commits into from
May 19, 2020
Merged

(GH-3587) Last changes to Styles, Themes and Templates #3796

merged 49 commits into from
May 19, 2020

Conversation

punker76
Copy link
Member

@punker76 punker76 commented May 12, 2020 •
edited
Loading

Describe the changes you have made to improve this project

Defaults

  • Use MahApps.Styles.WindowButtonCommands.Win10 as default
  • Use MahApps.Styles.Slider.Win10 as default
  • Use MahApps.Styles.RangeSlider.Win10 as default

Styles

  • Add resource dict Controls.ContentControl.xaml
    • MahApps.Styles.ContentControl.FloatingMessageContainer
    • MahApps.Styles.ContentControl.PathIcon
  • All TabControl styles in one resource dictionary
    • Add style MahApps.Styles.TabControl.AnimatedSingleRow
    • Add style MahApps.Styles.TabControl.Animated
    • Remove Controls.AnimatedSingleRowTabControl.xaml and Controls.AnimatedTabControl.xaml
  • Rename MahApps.Styles.Button.AccentedSquare to MahApps.Styles.Button.Square.Accent
  • Rename MahApps.Styles.Button.HighlightedSquare to MahApps.Styles.Button.Square.Highlight
  • Rename MahApps.Styles.Button.MetroAccentSquare to MahApps.Styles.Button.MetroSquare.Accent
  • Rename MahApps.Styles.Button.SplitArrow to MahApps.Styles.Button.Split.Arrow
  • Add HeaderHorizontalContentAlignment and HeaderVerticalContentAlignment attached properties to HeaderedControlHelper
  • Calendar style changes
    • Rename MahApps.Templates.Button.Previous to MahApps.Templates.Button.Calendar.Previous
    • Rename MahApps.Templates.Button.Next to MahApps.Templates.Button.Calendar.Next
    • Rename MahApps.Templates.Button.Header to MahApps.Templates.Button.Calendar.Header
    • Make PreviousCalendarButtonStyle public and rename to MahApps.Styles.Button.Calendar.Previous
    • Make NextCalendarButtonStyle public and rename to MahApps.Styles.Button.Calendar.Next
    • Make HeaderCalendarButtonStyle public and rename to MahApps.Styles.Button.Calendar.Header
  • Rename MahApps.Styles.TextBox.Editable to MahApps.Styles.TextBox.ComboBox.Editable
  • New style MahApps.Styles.CheckBox.DataGrid.Win10
  • Menu
    • Add Controls.MenuItem.xaml
    • Add Controls.Menu.xaml
  • Rename MahApps.Storyboard.ExpanderExpand to MahApps.Storyboard.Expander.Expand
  • Rename MahApps.Storyboard.ExpanderCollapse to MahApps.Storyboard.Expander.Collapse
  • New ExpandStoryboard and CollapseStoryboard attached property for ExpanderHelper
  • Rename MahApps.Styles.TextBox.Revealed to MahApps.Styles.TextBox.PasswordBox.Revealed
  • Rename MahApps.Styles.PasswordBox.ButtonRevealed to MahApps.Styles.PasswordBox.Button.Revealed
  • Rename MahApps.Controls.DefaultRevealButtonIcon to MahApps.Controls.RevealIcon
  • Rename MahApps.Controls.Grid.DefaultCapsLockIcon to MahApps.Controls.CapsLockIcon
  • New styles MahApps.Styles.ToolBar and MahApps.Styles.ToolBarTray
  • Rename MahApps.Styles.ToggleButton.ExpandCollapse to MahApps.Styles.ToggleButton.TreeViewItem.ExpandCollapse
  • Rename MahApps.ExponentialEase.InOut to MahApps.ExponentialEase.EaseInOut
  • Rename FlatButton.xaml to Controls.FlatButton.xaml
  • Rename FlatSlider.xaml to Controls.FlatSlider.xaml
  • Rename Shared.xaml to Controls.Shared.xaml
  • Remove Sizes.xaml
  • Rename ValidationErrorTemplate.xaml to Controls.ValidationError.xaml
  • Rename MahApps.Styles.Button.CleanWindow.Light to MahApps.Styles.Button.MetroWindow.Light.Clean
  • Rename MahApps.Styles.Button.CleanWindow.Dark to MahApps.Styles.Button.MetroWindow.Dark.Clean
  • Rename MahApps.Styles.Button.CleanWindowClose.Light to MahApps.Styles.Button.MetroWindow.Close.Light.Clean
  • Rename MahApps.Styles.Button.CleanWindowClose.Dark to MahApps.Styles.Button.MetroWindow.Close.Dark.Clean
  • Rename MahApps.Styles.Button.CleanWindow.Close.Light.Win10 to MahApps.Styles.Button.MetroWindow.Close.Light.Clean.Win10
  • Rename MahApps.Styles.Button.CleanWindow.Close.Dark.Win10 to MahApps.Styles.Button.MetroWindow.Close.Dark.Clean.Win10
  • Clean style
    • Rename Clean/Clean.xaml to Clean/Controls.xaml
    • Rename Clean/CleanGroupBox.xaml to Clean/GroupBox.xaml
    • Rename Clean/CleanStatusBar.xaml to Clean/StatusBar.xaml
    • Rename Clean/CleanWindow.xaml to Clean/MetroWindow.xaml
    • Rename Clean/CleanWindowButtonCommands.xaml to Clean/WindowButtonCommands.xaml
    • Rename Clean/CleanWindowButtons.xaml to Clean/WindowButtons.xaml
    • Rename Clean/CleanWindowCommands.xaml to Clean/WindowCommands.xaml
  • VS style
    • Rename VS/Styles.xaml to VS/Controls.xaml
    • Rename VS/Window.xaml to VS/MetroWindow.xaml
    • Add VS/MenuItem.xaml
    • Add VS/ContextMenu.xaml
  • Rename MahApps.Storyboard.ExpanderExpand to MahApps.Storyboard.Expander.Expand.VS
  • Rename MahApps.Storyboard.ExpanderCollapse to MahApps.Storyboard.Expander.Collapse.VS
  • Rename MahApps.Styles.TextBox.WindowQuickLaunch.VisualStudio to MahApps.Styles.TextBox.Window.QuickLaunch.VisualStudio

Theme Styles

  • Add style MahApps.Styles.FlipView
  • Rename FlipViewNavigationButton to MahApps.Styles.Button.FlipView.Navigation
  • Add style MahApps.Styles.Flyout
  • Rename MahApps.Templates.FlyoutHeader to MahApps.Templates.Flyout.Header
  • Rename MahApps.Templates.MetroTabControl.KeepVisualTreeInMemoryWhenChangingTabs to MahApps.Templates.MetroTabControl.KeepVisualTreeInMemory
  • Rename MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs to MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemory
  • Rename MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb to MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle
  • Rename MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb to MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle
  • Rename MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb.Win10 to MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle.Win10
  • Rename MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb.Win10 to MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle.Win10
  • Rename MahApps.Styles.FocusVisualStyle.ButtonSplit to MahApps.Styles.SplitButton.FocusVisualStyle
  • Rename MahApps.Storyboard.DialogShown to MahApps.Storyboard.Dialogs.Show
  • Rename MahApps.Storyboard.DialogClose to MahApps.Storyboard.Dialogs.Close

Closed Issues

Closes #3587
Closes #3799

@punker76
(GH-3587) Add resource dict Controls.ContentControl.xaml
be94b1e 
contains
- MahApps.Styles.ContentControl.FloatingMessageContainer
- MahApps.Styles.ContentControl.PathIcon
@punker76 punker76 added this to the 2.0.0 milestone May 12, 2020
@punker76 punker76 self-assigned this May 12, 2020
@punker76 punker76 force-pushed the feature/StylesTemplatesLastOne branch from 1df4618 to ced50d5 Compare May 16, 2020 10:08
@punker76
(GH-3587) All TabControl styles in one resource dictionary
9e73e57
@punker76
(GH-3587) Rename MahApps.Styles.Button.AccentedSquare to MahApps.Styl…
9237de6 
…es.Button.Square.Accent
@punker76
(GH-3587) Rename MahApps.Styles.Button.HighlightedSquare to MahApps.S…
dde8f1e 
…tyles.Button.Square.Highlight
@punker76
(GH-3587) Rename MahApps.Styles.Button.MetroAccentSquare to MahApps.S…
d2a82a8 
…tyles.Button.MetroSquare.Accent
@punker76
(GH-3587) Rename MahApps.Styles.Button.SplitArrow to MahApps.Styles.B…
b94a8a4 
…utton.Split.Arrow
@punker76
(GH-3587) Add HeaderHorizontalContentAlignment and HeaderVerticalCont…
c30f63e 
…entAlignment attached properties to HeaderedControlHelper
@punker76
(GH-3587) Calendar style
53d1381 
- Rename MahApps.Templates.Button.Previous to MahApps.Templates.Button.Calendar.Previous
- Rename MahApps.Templates.Button.Next to MahApps.Templates.Button.Calendar.Next
- Rename MahApps.Templates.Button.Header to MahApps.Templates.Button.Calendar.Header
- Make PreviousCalendarButtonStyle public and rename  to MahApps.Styles.Button.Calendar.Previous
- Make NextCalendarButtonStyle public and rename to MahApps.Styles.Button.Calendar.Next
- Make HeaderCalendarButtonStyle public and rename to MahApps.Styles.Button.Calendar.Header
@punker76
(GH-3587) Rename MahApps.Styles.TextBox.Editable to MahApps.Styles.Te…
1aa67a7 
…xtBox.ComboBox.Editable
@punker76
(GH-3587) Rename MahApps.Storyboard.ExpanderExpand to MahApps.Storybo…
dd6505e 
…ard.Expander.Expand
@punker76
(GH-3587) Rename MahApps.Storyboard.ExpanderCollapse to MahApps.Story…
35ff830 
…board.Expander.Collapse
@punker76
(GH-3587) New ExpandStoryboard and CollapseStoryboard attached proper…
e99e514 
…ty for ExpanderHelper
@punker76
(GH-3587) Rename MahApps.Styles.TextBox.Revealed to MahApps.Styles.Te…
daa25e0 
…xtBox.PasswordBox.Revealed
@punker76
(GH-3587) Rename MahApps.Styles.PasswordBox.ButtonRevealed to MahApps…
3425221 
….Styles.PasswordBox.Button.Revealed
@punker76
(GH-3587) Rename MahApps.Controls.DefaultRevealButtonIcon to MahApps.…
bfe07ce 
…Controls.RevealIcon
@punker76
(GH-3587) Rename MahApps.Controls.Grid.DefaultCapsLockIcon to MahApps…
99ce36e 
….Controls.CapsLockIcon
@punker76
(GH-3587) New styles MahApps.Styles.ToolBar and MahApps.Styles.ToolBa…
4f5b1fe 
…rTray
@punker76
(GH-3587) Rename MahApps.Styles.ToggleButton.ExpandCollapse to MahApp…
edeae60 
…s.Styles.ToggleButton.TreeViewItem.ExpandCollapse
@punker76
(GH-3587) Rename MahApps.ExponentialEase.InOut to MahApps.Exponential…
3f78d14 
…Ease.EaseInOut
@punker76
(GH-3587) Rename FlatButton.xaml to Controls.FlatButton.xaml
a5ab3d5
@punker76
(GH-3587) Rename FlatSlider.xaml to Controls.FlatSlider.xaml
8114716
@punker76
(GH-3587) Rename Shared.xaml to Controls.Shared.xaml
24d9813
@punker76
(GH-3587) Remove Sizes.xaml, Rename ValidationErrorTemplate.xaml to C…
ef5d2ff 
…ontrols.ValidationError.xaml
@punker76
(GH-3587) Rename MahApps.Styles.Button.CleanWindow.Light to MahApps.S…
4f21ff6 
…tyles.Button.MetroWindow.Light.Clean
@punker76
(GH-3587) Rename MahApps.Styles.Button.CleanWindow.Dark to MahApps.St…
8dd2509 
…yles.Button.MetroWindow.Dark.Clean
@punker76
(GH-3587) Rename MahApps.Styles.Button.CleanWindowClose.Light to MahA…
f83f3e1 
…pps.Styles.Button.MetroWindow.Close.Light.Clean
@punker76
(GH-3587) Rename MahApps.Styles.Button.CleanWindowClose.Dark to MahAp…
1da44b7 
…ps.Styles.Button.MetroWindow.Close.Dark.Clean
@punker76
(GH-3587) Rename MahApps.Styles.Button.CleanWindow.Close.Light.Win10 …
f59352c 
…to MahApps.Styles.Button.MetroWindow.Close.Light.Clean.Win10
@punker76
(GH-3587) Rename MahApps.Styles.Button.CleanWindow.Close.Dark.Win10 t…
f890582 
…o MahApps.Styles.Button.MetroWindow.Close.Dark.Clean.Win10
@punker76
(GH-3587) Clean style
7caa387 
- Rename Clean/Clean.xaml to Clean/Controls.xaml
- Rename Clean/CleanGroupBox.xaml to Clean/GroupBox.xaml
- Rename Clean/CleanStatusBar.xaml to Clean/StatusBar.xaml
- Rename Clean/CleanWindow.xaml to Clean/MetroWindow.xaml
- Rename Clean/CleanWindowButtonCommands.xaml to Clean/WindowButtonCommands.xaml
- Rename Clean/CleanWindowButtons.xaml to Clean/WindowButtons.xaml
- Rename Clean/CleanWindowCommands.xaml to Clean/WindowCommands.xaml
@punker76
(GH-3799) Fix Calendar doesn't show inactive days
3bea35b
@punker76
(GH-3587) VS style
792646a 
- Rename VS/Styles.xaml to VS/Controls.xaml
- Rename VS/Window.xaml to VS/MetroWindow.xaml
@punker76
(GH-3587) Rename MahApps.Storyboard.ExpanderExpand to MahApps.Storybo…
e8d8589 
…ard.Expander.Expand.VS and MahApps.Storyboard.ExpanderCollapse to MahApps.Storyboard.Expander.Collapse.VS
@punker76
(GH-3587) Rename MahApps.Styles.TextBox.WindowQuickLaunch.VisualStudi…
d68b607 
…o to MahApps.Styles.TextBox.Window.QuickLaunch.VisualStudio
@punker76
(GH-3587) FlipView
e92cb5f 
- Create style MahApps.Styles.FlipView
- Rename FlipViewNavigationButton to MahApps.Styles.Button.FlipView.Navigation
@punker76
(GH-3587) Flyout
05b5b9f 
- Add style MahApps.Styles.Flyout
- Rename MahApps.Templates.FlyoutHeader to MahApps.Templates.Flyout.Header
@punker76
(GH-3587) MetroTabControl
3385baa 
- Rename MahApps.Templates.MetroTabControl.KeepVisualTreeInMemoryWhenChangingTabs to MahApps.Templates.MetroTabControl.KeepVisualTreeInMemory
- Rename MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs to MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemory
@punker76
(GH-3587) RangeSlider
cc2277f 
- Rename MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb to MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle
- Rename MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb to MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle
- Rename MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb.Win10 to MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle.Win10
- Rename MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb.Win10 to MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle.Win10
@punker76
(GH-3587) - Rename MahApps.Styles.FocusVisualStyle.ButtonSplit to Mah…
ff3ab5e 
…Apps.Styles.SplitButton.FocusVisualStyle
@punker76
(GH-3587) Dialogs
8c67b87 
- Rename MahApps.Storyboard.DialogShown to MahApps.Storyboard.Dialogs.Show
- Rename MahApps.Storyboard.DialogClose to MahApps.Storyboard.Dialogs.Close
@punker76
(GH-3587) Use MahApps.Styles.WindowButtonCommands.Win10 as default
8e9d8e6
@punker76
(GH-3587) Slider default style
95c7bab 
- Use MahApps.Styles.Slider.Win10 as default
- Use MahApps.Styles.RangeSlider.Win10 as default
@punker76
(GH-3587) Change TargetType for MahApps.Styles.Button.Flat to ButtonBase
4465363
@punker76
(GH-3587) New style MahApps.Styles.CheckBox.DataGrid.Win10
5b42382
@punker76
(GH-3587) Minor DataGrid cell template style tweaks
7d88d7d
@punker76
(GH-3587) Separate menu styles
60d798a 
- Add Controls.MenuItem.xaml
- Add Controls.Menu.xaml
- Add VS/MenuItem.xaml
- Add VS/ContextMenu.xaml
@punker76 punker76 changed the title WIP (GH-3587) Last changes to Styles, Themes and Templates (GH-3587) Last changes to Styles, Themes and Templates May 19, 2020
@punker76 punker76 merged commit dec2f65 into develop May 19, 2020
@punker76 punker76 deleted the feature/StylesTemplatesLastOne branch May 19, 2020 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@punker76 punker76

Labels
Breaking Change
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.

Calendar doesn't show inactive days Styles vs Themes Namespaces
1 participant
@punker76