From dedffd77a1fb4954d747f0e45af9a06b4ac5dd1e Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Fri, 7 Apr 2023 14:55:19 -0400 Subject: [PATCH] Initial commit --- .gitignore | 350 ++++++++++++++++++ ImageButton/ImageButton.xaml | 25 ++ ImageButton/ImageButton.xaml.cs | 30 ++ LICENSE | 21 ++ README.md | 19 + SplitButton/SplitButton.cs | 150 ++++++++ SplitButton/SplitButtonStyle.xaml | 468 ++++++++++++++++++++++++ Wpf.Controls.Toolbar.csproj | 22 ++ Wpf.Controls.Toolbar.csproj.DotSettings | 3 + Wpf.Controls.Toolbar.sln | 25 ++ azure-pipelines.yml | 45 +++ 11 files changed, 1158 insertions(+) create mode 100644 .gitignore create mode 100644 ImageButton/ImageButton.xaml create mode 100644 ImageButton/ImageButton.xaml.cs create mode 100644 LICENSE create mode 100644 README.md create mode 100644 SplitButton/SplitButton.cs create mode 100644 SplitButton/SplitButtonStyle.xaml create mode 100644 Wpf.Controls.Toolbar.csproj create mode 100644 Wpf.Controls.Toolbar.csproj.DotSettings create mode 100644 Wpf.Controls.Toolbar.sln create mode 100644 azure-pipelines.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dfcfd56 --- /dev/null +++ b/.gitignore @@ -0,0 +1,350 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/ImageButton/ImageButton.xaml b/ImageButton/ImageButton.xaml new file mode 100644 index 0000000..2f74849 --- /dev/null +++ b/ImageButton/ImageButton.xaml @@ -0,0 +1,25 @@ + diff --git a/ImageButton/ImageButton.xaml.cs b/ImageButton/ImageButton.xaml.cs new file mode 100644 index 0000000..42b9d14 --- /dev/null +++ b/ImageButton/ImageButton.xaml.cs @@ -0,0 +1,30 @@ +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; + +namespace ChrisKaczor.Wpf.Controls.Toolbar +{ + public partial class ImageButton + { + public ImageButton() + { + InitializeComponent(); + + Loaded += HandleImageButtonLoaded; + } + + void HandleImageButtonLoaded(object sender, RoutedEventArgs e) + { + if (Style == null && Parent is ToolBar) + { + Style = (Style) FindResource(ToolBar.ButtonStyleKey); + } + } + + public ImageSource ImageSource + { + get { return image.Source; } + set { image.Source = value; } + } + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9bb69bc --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Chris Kaczor + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..84aa295 --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +# ChrisKaczor.Wpf.Controls.Toolbar + +WPF controls that provide extra buttons for the WPF toolbar control. + +## Authors + +* **Chris Kaczor** - *Initial work* - https://github.com/ckaczor - https://chriskaczor.com + +## License + +This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details. + +## Credits + +SplitButton code from Huy Pham at: http://huydinhpham.blogspot.com/2008/09/wpf-drop-down-and-split-button.html + +## Disclaimer + +This code is used by my various personal projects and may not be useful or work in all use cases. \ No newline at end of file diff --git a/SplitButton/SplitButton.cs b/SplitButton/SplitButton.cs new file mode 100644 index 0000000..a94a063 --- /dev/null +++ b/SplitButton/SplitButton.cs @@ -0,0 +1,150 @@ +// -------------------------------- +// Copyright (c) Huy Pham. All rights reserved. +// This source code is made available under the terms of the Microsoft Public License (Ms-PL) +// http://www.opensource.org/licenses/ms-pl.html +// --------------------------------- + +using System.Windows; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Data; +using System.Windows.Input; +using System.Windows.Media; + +namespace ChrisKaczor.Wpf.Controls.Toolbar +{ + [TemplatePart(Name = "PART_Button", Type = typeof(ButtonBase))] + public class SplitButton : ToggleButton + { + #region Dependency Properties + + public static readonly DependencyProperty DropDownContextMenuProperty = DependencyProperty.Register("DropDownContextMenu", typeof(ContextMenu), typeof(SplitButton), new UIPropertyMetadata(null)); + public static readonly DependencyProperty ImageProperty = DependencyProperty.Register("Image", typeof(ImageSource), typeof(SplitButton)); + public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(SplitButton)); + public static readonly DependencyProperty TargetProperty = DependencyProperty.Register("Target", typeof(UIElement), typeof(SplitButton)); + public static readonly DependencyProperty MainButtonCommandProperty = DependencyProperty.Register("MainButtonCommand", typeof(ICommand), typeof(SplitButton), new FrameworkPropertyMetadata(null)); + public static readonly DependencyProperty DropDownButtonCommandProperty = DependencyProperty.Register("DropDownButtonCommand", typeof(ICommand), typeof(SplitButton), new FrameworkPropertyMetadata(null)); + + #endregion + + #region Constructors + + public SplitButton() + { + // Bind the ToogleButton.IsChecked property to the drop-down's IsOpen property + var binding = new Binding("DropDownContextMenu.IsOpen") { Source = this }; + SetBinding(IsCheckedProperty, binding); + + Loaded += HandleSplitButtonLoaded; + } + + void HandleSplitButtonLoaded(object sender, RoutedEventArgs e) + { + if (Parent is ToolBar) + { + Style style = (Style) TryFindResource("ToolBarSplitButtonStyle"); + if (style != null) + Style = style; + } + + Loaded -= HandleSplitButtonLoaded; + } + + #endregion + + #region Properties + + public ContextMenu? DropDownContextMenu + { + get => GetValue(DropDownContextMenuProperty) as ContextMenu; + set => SetValue(DropDownContextMenuProperty, value); + } + + public ImageSource? Image + { + get => GetValue(ImageProperty) as ImageSource; + set => SetValue(ImageProperty, value); + } + + public string? Text + { + get => GetValue(TextProperty) as string; + set => SetValue(TextProperty, value); + } + + public UIElement? Target + { + get => GetValue(TargetProperty) as UIElement; + set => SetValue(TargetProperty, value); + } + + public ICommand? MainButtonCommand + { + get => GetValue(MainButtonCommandProperty) as ICommand; + set => SetValue(MainButtonCommandProperty, value); + } + + public ICommand? DropDownButtonCommand + { + get => GetValue(DropDownButtonCommandProperty) as ICommand; + set => SetValue(DropDownButtonCommandProperty, value); + } + + #endregion + + #region Public Override Methods + + /// + /// + /// + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + SetMainButtonCommand(); + } + + #endregion + + #region Protected Override Methods + + protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e) + { + base.OnPropertyChanged(e); + + if (e.Property == MainButtonCommandProperty) + SetMainButtonCommand(); + + if (e.Property == DropDownButtonCommandProperty) + Command = DropDownButtonCommand; + } + + protected override void OnClick() + { + if (DropDownContextMenu == null) return; + + if (DropDownButtonCommand != null) + DropDownButtonCommand.Execute(null); + + // If there is a drop-down assigned to this button, then position and display it + DropDownContextMenu.PlacementTarget = this; + DropDownContextMenu.Placement = PlacementMode.Bottom; + DropDownContextMenu.IsOpen = !DropDownContextMenu.IsOpen; + } + + #endregion + + #region Private Methods + + private void SetMainButtonCommand() + { + // Set up the event handlers + if (Template != null) + { + var button = Template.FindName("PART_Button", this) as ButtonBase; + if (button != null) button.Command = MainButtonCommand; + } + } + + #endregion + } +} \ No newline at end of file diff --git a/SplitButton/SplitButtonStyle.xaml b/SplitButton/SplitButtonStyle.xaml new file mode 100644 index 0000000..c8c71a7 --- /dev/null +++ b/SplitButton/SplitButtonStyle.xaml @@ -0,0 +1,468 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Wpf.Controls.Toolbar.csproj b/Wpf.Controls.Toolbar.csproj new file mode 100644 index 0000000..0d7b357 --- /dev/null +++ b/Wpf.Controls.Toolbar.csproj @@ -0,0 +1,22 @@ + + + net7.0-windows + enable + true + ChrisKaczor.Wpf.Controls + ChrisKaczor.Wpf.Controls.Toolbar + Chris Kaczor + ChrisKaczor.Wpf.Controls.Toolbar + https://github.com/ckaczor/ChrisKaczor.Wpf.Controls.Toolbar + README.md + WPF controls that provide extra buttons for the WPF toolbar control. + ChrisKaczor.Wpf.Controls.Toolbar + README.md + + + + True + \ + + + \ No newline at end of file diff --git a/Wpf.Controls.Toolbar.csproj.DotSettings b/Wpf.Controls.Toolbar.csproj.DotSettings new file mode 100644 index 0000000..e5f7b70 --- /dev/null +++ b/Wpf.Controls.Toolbar.csproj.DotSettings @@ -0,0 +1,3 @@ + + True + True \ No newline at end of file diff --git a/Wpf.Controls.Toolbar.sln b/Wpf.Controls.Toolbar.sln new file mode 100644 index 0000000..0eaf41c --- /dev/null +++ b/Wpf.Controls.Toolbar.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33424.131 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Controls.Toolbar", "Wpf.Controls.Toolbar.csproj", "{3D90E8D5-FF7A-41AF-9225-B027A0A9AE11}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3D90E8D5-FF7A-41AF-9225-B027A0A9AE11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3D90E8D5-FF7A-41AF-9225-B027A0A9AE11}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3D90E8D5-FF7A-41AF-9225-B027A0A9AE11}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3D90E8D5-FF7A-41AF-9225-B027A0A9AE11}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2D388AD8-858E-4C40-811D-D2F7662055FA} + EndGlobalSection +EndGlobal diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..87bd652 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,45 @@ +name: 1.0.$(Rev:r) + +pr: none + +trigger: + batch: 'true' + branches: + include: + - main + +pool: + vmImage: 'windows-latest' + +variables: + buildConfiguration: 'Release' + +steps: + +- task: DotNetCoreCLI@2 + displayName: 'dotnet build' + inputs: + command: 'build' + arguments: '--configuration $(buildConfiguration)' + projects: 'Wpf.Controls.Toolbar.csproj' + +- task: DotNetCoreCLI@2 + displayName: "dotnet pack" + inputs: + command: 'pack' + arguments: '--configuration $(buildConfiguration)' + packagesToPack: 'Wpf.Controls.Toolbar.csproj' + nobuild: true + versioningScheme: 'byBuildNumber' + +- task: NuGetCommand@2 + displayName: 'nuget push' + inputs: + command: 'push' + feedsToUse: 'select' + packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' + nuGetFeedType: external + publishFeedCredentials: 'NuGet' + publishVstsFeed: 'Packages' + versioningScheme: 'byBuildNumber' + allowPackageConflicts: true \ No newline at end of file