Skip to content

Commit

Permalink
Merge pull request #107 from Krypton-Suite/alpha
Browse files Browse the repository at this point in the history
* August Release - Too many to review
  • Loading branch information
Smurf-IV authored Aug 22, 2022
2 parents a158dc9 + 789ab18 commit 3c61b38
Show file tree
Hide file tree
Showing 312 changed files with 9,626 additions and 11,853 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
*.ini
/Source/WixInstaller/WixInstaller/BasePath50.wxs
/Source/WixInstaller/WixInstaller/BasePath48.wxs
/Source/WixInstaller/WixInstaller.net50/BasePath50.wxs
/Source/WixInstaller/WixInstaller.net48/BasePath48.wxs
/Source/WixInstaller/WixInstaller.net60/BasePath60.wxs
46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dev.wagnerp@outlook.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
4 changes: 4 additions & 0 deletions Documents/Help/Changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# <img src="https://github.com/Krypton-Suite/Standard-Toolkit-Demos/blob/master/Krypton.png"> Standard Toolkit Demos - Changelog

## 2022-01-05 - Build 2201 - January 2022
* Added double click functionality to combo box, list box, list view, tree view etc demos
6 changes: 6 additions & 0 deletions Source/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ dotnet_sort_system_directives_first = true
dotnet_separate_import_directive_groups = true
dotnet_code_quality.enable_platform_analyzer_on_pre_net5_target=true

# Naming rule violation: These words must begin with upper case characters: textBoxResponse_KeyDown
dotnet_diagnostic.IDE1006.severity = silent

# Remove unnecessary suppression
dotnet_diagnostic.IDE0079.severity = silent

# CS1591: Missing XML comment for publicly visible type or member
dotnet_diagnostic.CS1591.severity = silent

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net48;net5.0-windows;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>DockingCustomized</RootNamespace>
<AssemblyName>Docking Customized</AssemblyName>
Expand All @@ -16,16 +16,16 @@
<Choose>
<When Condition="'$(SolutionName.Endswith(`Nuget`))'">
<ItemGroup>
<PackageReference Include="Krypton.Toolkit.Canary" Version="6.2110.274-beta" />
<PackageReference Include="Krypton.Docking.Canary" Version="6.2110.274-beta" />
<PackageReference Include="Krypton.Ribbon.Canary" Version="6.2110.274-beta" />
<PackageReference Include="Krypton.Toolkit.Canary" Version="65.22.3.89-beta" />
<PackageReference Include="Krypton.Docking.Canary" Version="65.22.3.89-beta" />
<PackageReference Include="Krypton.Ribbon.Canary" Version="65.22.3.89-beta" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Toolkit\Krypton.Toolkit 2019.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Docking\Krypton.Docking 2019.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Ribbon\Krypton.Ribbon 2019.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Toolkit\Krypton.Toolkit 2022.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Docking\Krypton.Docking 2022.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Ribbon\Krypton.Ribbon 2022.csproj" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">No</s:String></wpf:ResourceDictionary>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 7 additions & 16 deletions Source/Krypton Docking Examples/Docking Customized/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public partial class Form1 : KryptonForm
private int _count = 1;
private Random _random = new Random(DateTime.Now.Millisecond);
private NavigatorMode _mode = NavigatorMode.HeaderBarCheckButtonHeaderGroup;
private PaletteButtonSpecStyle[] _buttonSpecStyles = new PaletteButtonSpecStyle[]{ PaletteButtonSpecStyle.ArrowDown, PaletteButtonSpecStyle.ArrowLeft,
private PaletteButtonSpecStyle[] _buttonSpecStyles = new[]{ PaletteButtonSpecStyle.ArrowDown, PaletteButtonSpecStyle.ArrowLeft,
PaletteButtonSpecStyle.ArrowRight, PaletteButtonSpecStyle.ArrowUp,
PaletteButtonSpecStyle.Close, PaletteButtonSpecStyle.Context,
PaletteButtonSpecStyle.DropDown };
Expand All @@ -46,15 +46,9 @@ private KryptonPage NewDocument()
return page;
}

private KryptonPage NewInput()
{
return NewPage("Input ", 1, new ContentInput());
}
private KryptonPage NewInput() => NewPage("Input ", 1, new ContentInput());

private KryptonPage NewPropertyGrid()
{
return NewPage("Properties ", 2, new ContentPropertyGrid());
}
private KryptonPage NewPropertyGrid() => NewPage("Properties ", 2, new ContentPropertyGrid());

private KryptonPage NewPage(string name, int image, Control content)
{
Expand Down Expand Up @@ -83,9 +77,9 @@ private void Form1_Load(object sender, EventArgs e)
kryptonDockingManager.ManageFloating(this);

// Add initial docking pages
kryptonDockingManager.AddToWorkspace("Workspace", new KryptonPage[] { NewDocument(), NewDocument() });
kryptonDockingManager.AddDockspace("Control", DockingEdge.Right, new KryptonPage[] { NewPropertyGrid(), NewInput(), NewPropertyGrid(), NewInput() });
kryptonDockingManager.AddDockspace("Control", DockingEdge.Bottom, new KryptonPage[] { NewInput(), NewPropertyGrid(), NewInput(), NewPropertyGrid() });
kryptonDockingManager.AddToWorkspace("Workspace", new[] { NewDocument(), NewDocument() });
kryptonDockingManager.AddDockspace(@"Control", DockingEdge.Right, new[] { NewPropertyGrid(), NewInput(), NewPropertyGrid(), NewInput() });
kryptonDockingManager.AddDockspace(@"Control", DockingEdge.Bottom, new[] { NewInput(), NewPropertyGrid(), NewInput(), NewPropertyGrid() });

UpdateModeButtons();
}
Expand Down Expand Up @@ -251,9 +245,6 @@ private void UpdateCell(KryptonWorkspaceCell cell)
cell.NavigatorMode = _mode;
}

private Color RandomColor()
{
return Color.FromArgb(_random.Next(255), _random.Next(255), _random.Next(255));
}
private Color RandomColor() => Color.FromArgb(_random.Next(255), _random.Next(255), _random.Next(255));
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net48;net5.0-windows;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>DockingFlags</RootNamespace>
<AssemblyName>Docking Flags</AssemblyName>
Expand All @@ -16,14 +16,14 @@
<Choose>
<When Condition="'$(SolutionName.Endswith(`Nuget`))'">
<ItemGroup>
<PackageReference Include="Krypton.Toolkit.Canary" Version="6.2110.274-beta" />
<PackageReference Include="Krypton.Docking.Canary" Version="6.2110.274-beta" />
<PackageReference Include="Krypton.Toolkit.Canary" Version="65.22.3.89-beta" />
<PackageReference Include="Krypton.Docking.Canary" Version="65.22.3.89-beta" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Toolkit\Krypton.Toolkit 2019.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Docking\Krypton.Docking 2019.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Toolkit\Krypton.Toolkit 2022.csproj" />
<ProjectReference Include="..\..\..\..\Standard-Toolkit\Source\Krypton Components\Krypton.Docking\Krypton.Docking 2022.csproj" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">No</s:String></wpf:ResourceDictionary>
6 changes: 3 additions & 3 deletions Source/Krypton Docking Examples/Docking Flags/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ private void Form1_Load(object sender, EventArgs e)
kryptonDockingManager.ManageFloating(this);

// Add docking pages
kryptonDockingManager.AddDockspace("Control", DockingEdge.Left, new KryptonPage[] { NewFlags(), NewFlags() });
kryptonDockingManager.AddDockspace("Control", DockingEdge.Bottom, new KryptonPage[] { NewDocument() });
kryptonDockingManager.AddToWorkspace("Workspace", new KryptonPage[] { NewFlags(), NewFlags() });
kryptonDockingManager.AddDockspace(@"Control", DockingEdge.Left, new[] { NewFlags(), NewFlags() });
kryptonDockingManager.AddDockspace(@"Control", DockingEdge.Bottom, new[] { NewDocument() });
kryptonDockingManager.AddToWorkspace("Workspace", new[] { NewFlags(), NewFlags() });
}
}
}
Loading

0 comments on commit 3c61b38

Please sign in to comment.