Skip to content

Commit

Permalink
Updaed XAML behaviors package source Grandpappy#26
Browse files Browse the repository at this point in the history
- Added XAML Behaviors package to use Nuget source
- Updated previous namespaces to match new source
- Updated namespace prefixes to match new source
  • Loading branch information
jamespfluger committed Apr 26, 2020
1 parent 2cedec3 commit 583c5bc
Show file tree
Hide file tree
Showing 13 changed files with 4,807 additions and 24 deletions.
14 changes: 7 additions & 7 deletions src/eXeMeL/eXeMeL/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
ResizeMode="CanResize"
SaveWindowPosition="True"
mc:Ignorable="d"
Expand Down Expand Up @@ -142,12 +142,12 @@

<Grid Background="#00000000">
<i:Interaction.Triggers>
<ei:DataTrigger Binding="{Binding EditorMode}" Value="Editor">
<ei:GoToStateAction x:Name="GoToEditorViewAction" StateName="Editor"/>
</ei:DataTrigger>
<ei:DataTrigger Binding="{Binding EditorMode}" Value="XmlUtility">
<ei:GoToStateAction x:Name="GoToXmlUtilityAction" StateName="XmlUtility"/>
</ei:DataTrigger>
<i:DataTrigger Binding="{Binding EditorMode}" Value="Editor">
<i:GoToStateAction x:Name="GoToEditorViewAction" StateName="Editor"/>
</i:DataTrigger>
<i:DataTrigger Binding="{Binding EditorMode}" Value="XmlUtility">
<i:GoToStateAction x:Name="GoToXmlUtilityAction" StateName="XmlUtility"/>
</i:DataTrigger>
</i:Interaction.Triggers>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="EditorView">
Expand Down
26 changes: 13 additions & 13 deletions src/eXeMeL/eXeMeL/View/XmlUtilityView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:eXeMeL.View"
xmlns:vm="clr-namespace:eXeMeL.ViewModel"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions" x:Class="eXeMeL.View.XmlUtilityView"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors" x:Class="eXeMeL.View.XmlUtilityView"
xmlns:mahapps="clr-namespace:MahApps.Metro;assembly=MahApps.Metro"
mc:Ignorable="d"
Name="ControlRoot"
Expand Down Expand Up @@ -242,18 +242,18 @@
</VisualStateManager.VisualStateGroups>

<i:Interaction.Triggers>
<ei:DataTrigger Binding="{Binding IsXmlValid}" Value="False">
<ei:GoToStateAction x:Name="GoToInvalidXmlVisualStateAction" StateName="InvalidXml"/>
</ei:DataTrigger>
<ei:DataTrigger Binding="{Binding IsXmlValid}" Value="True">
<ei:GoToStateAction x:Name="GoToValidXmlVisualStateAction" StateName="ValidXml"/>
</ei:DataTrigger>
<!--<ei:DataTrigger Binding="{Binding IsBusy}" Value="True">
<ei:GoToStateAction x:Name="GoToLoadingVisualStateAction" StateName="LoadingXml"/>
</ei:DataTrigger>
<ei:DataTrigger Binding="{Binding IsBusy}" Value="False">
<ei:GoToStateAction x:Name="GoToLoadedXmlVisualStateAction" StateName="XmlLoaded"/>
</ei:DataTrigger>-->
<i:DataTrigger Binding="{Binding IsXmlValid}" Value="False">
<i:GoToStateAction x:Name="GoToInvalidXmlVisualStateAction" StateName="InvalidXml"/>
</i:DataTrigger>
<i:DataTrigger Binding="{Binding IsXmlValid}" Value="True">
<i:GoToStateAction x:Name="GoToValidXmlVisualStateAction" StateName="ValidXml"/>
</i:DataTrigger>
<!--<i:DataTrigger Binding="{Binding IsBusy}" Value="True">
<i:GoToStateAction x:Name="GoToLoadingVisualStateAction" StateName="LoadingXml"/>
</i:DataTrigger>
<i:DataTrigger Binding="{Binding IsBusy}" Value="False">
<i:GoToStateAction x:Name="GoToLoadedXmlVisualStateAction" StateName="XmlLoaded"/>
</i:DataTrigger>-->
</i:Interaction.Triggers>

<Grid x:Name="OuterContainer">
Expand Down
7 changes: 3 additions & 4 deletions src/eXeMeL/eXeMeL/eXeMeL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MahApps.Metro.0.12.1.0\lib\net45\MahApps.Metro.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Expression.Interactions" />
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
<Reference Include="MvvmFoundation.Wpf">
<HintPath>..\packages\MvvmFoundation.Wpf.1.0.0\lib\net40\MvvmFoundation.Wpf.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.0.12.1.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
Expand Down
1 change: 1 addition & 0 deletions src/eXeMeL/eXeMeL/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<package id="AvalonEdit" version="4.4.0.9727" targetFramework="net45" />
<package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
<package id="MahApps.Metro" version="0.12.1.0" targetFramework="net45" />
<package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.19" targetFramework="net45" />
<package id="MvvmFoundation.Wpf" version="1.0.0" targetFramework="net45" />
<package id="MvvmLight" version="4.1.27.0" targetFramework="net45" />
<package id="MvvmLightLibs" version="4.1.27.0" targetFramework="net45" />
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 583c5bc

Please sign in to comment.