Skip to content

Commit

Permalink
v2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@john-ds
john-ds committed Sep 23, 2022
1 parent 63606b1 commit dd61bf4
Show file tree
Hide file tree
Showing 9 changed files with 230 additions and 24 deletions.
195 changes: 195 additions & 0 deletions Express Apps/ExpressIcons.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2085,6 +2085,74 @@
</Canvas>
</Viewbox>

<Viewbox x:Key="CircleTickIcon" x:Shared="False" Stretch="Uniform">
<Canvas Width="26.458333" Height="26.458334">
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="0"/>
</Canvas.RenderTransform>
<Canvas.Resources>
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="circle_tick_linearGradient855" MappingMode="Absolute" StartPoint="78,87" EndPoint="2,11">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FF50D18D" Offset="0"/>
<GradientStop Color="#FF9DFFCE" Offset="1"/>
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Canvas.Resources>
<Canvas>
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="-270.54165"/>
</Canvas.RenderTransform>
<Canvas Opacity="1">
<Canvas.RenderTransform>
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
</Canvas.RenderTransform>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="{StaticResource circle_tick_linearGradient855}" StrokeThickness="6.13039" Stroke="#FF429E45" StrokeMiterLimit="4" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round">
<Path.Data>
<PathGeometry Figures="M 83.816652 53.392845 A 39.709508 39.962476 0 0 1 44.107143 93.35532 39.709508 39.962476 0 0 1 4.3976352 53.392845 39.709508 39.962476 0 0 1 44.107143 13.430369 39.709508 39.962476 0 0 1 83.816652 53.392845 Z" FillRule="EvenOdd"/>
</Path.Data>
</Path>
<Canvas>
<Canvas.RenderTransform>
<MatrixTransform Matrix="0.69625059 0 0 0.7492762 10.687115 13.381203"/>
</Canvas.RenderTransform>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="#FF125933" StrokeThickness="0.999464" StrokeMiterLimit="4">
<Path.Data>
<PathGeometry Figures="M 81.199219 24.199219 34 71.398438 14.800781 52.199219 9.199219 58 34 82.601562 86.800781 29.800781 Z m 0 0" FillRule="NonZero"/>
</Path.Data>
</Path>
</Canvas>
</Canvas>
</Canvas>
</Canvas>
</Viewbox>

<Viewbox x:Key="CircleUntickIcon" x:Shared="False" Stretch="Uniform">
<Canvas Width="26.458333" Height="26.458334">
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="0"/>
</Canvas.RenderTransform>
<Canvas.Resources>
</Canvas.Resources>
<Canvas>
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="-270.54165"/>
</Canvas.RenderTransform>
<Canvas Opacity="1">
<Canvas.RenderTransform>
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
</Canvas.RenderTransform>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StrokeThickness="6.13039" Stroke="#FF429E45" StrokeMiterLimit="4" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round">
<Path.Data>
<PathGeometry Figures="M 83.81665 53.392845 A 39.709507 39.962475 0 0 1 44.107143 93.35532 39.709507 39.962475 0 0 1 4.3976364 53.392845 39.709507 39.962475 0 0 1 44.107143 13.43037 39.709507 39.962475 0 0 1 83.81665 53.392845 Z" FillRule="EvenOdd"/>
</Path.Data>
</Path>
</Canvas>
</Canvas>
</Canvas>
</Viewbox>

<Viewbox x:Key="CloseIcon" x:Shared="False" Stretch="Uniform">
<Canvas Width="26.458333" Height="26.458334">
<Canvas.RenderTransform>
Expand Down Expand Up @@ -6349,6 +6417,65 @@
</Canvas>
</Viewbox>

<Viewbox x:Key="ItalyIcon" x:Shared="False" Stretch="Uniform">
<Canvas Width="26.458333" Height="26.458334">
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="0"/>
</Canvas.RenderTransform>
<Canvas.Resources>
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="italy_linearGradient845" MappingMode="Absolute" StartPoint="27,77" EndPoint="7,28">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FF689F38" Offset="0"/>
<GradientStop Color="#FF72AF3E" Offset="1"/>
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="italy_linearGradient853" MappingMode="Absolute" StartPoint="58,81" EndPoint="30,26">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FFECEFF1" Offset="0"/>
<GradientStop Color="#FFECEFFD" Offset="1"/>
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="italy_linearGradient863" MappingMode="Absolute" StartPoint="86,81" EndPoint="58,26">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FFFF3D00" Offset="0"/>
<GradientStop Color="#FFFF5829" Offset="1"/>
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Canvas.Resources>
<Canvas>
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="-270.54165"/>
</Canvas.RenderTransform>
<Canvas Opacity="1">
<Canvas.RenderTransform>
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
</Canvas.RenderTransform>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="{StaticResource italy_linearGradient845}" StrokeThickness="8.93858" StrokeMiterLimit="4" StrokeLineJoin="Miter" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1">
<Path.Data>
<PathGeometry Figures="M 2.1543884 26.160702 H 30.122892 V 80.624989 H 2.1543884 Z" FillRule="NonZero"/>
</Path.Data>
</Path>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="{StaticResource italy_linearGradient853}" StrokeThickness="8.93858" StrokeMiterLimit="4" StrokeLineJoin="Miter" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1">
<Path.Data>
<PathGeometry Figures="M 30.122892 26.160702 H 58.091396 V 80.624989 H 30.122892 Z" FillRule="NonZero"/>
</Path.Data>
</Path>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="{StaticResource italy_linearGradient863}" StrokeThickness="8.93858" StrokeMiterLimit="4" StrokeLineJoin="Miter" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1">
<Path.Data>
<PathGeometry Figures="M 58.091396 26.160702 H 86.0599 V 80.624989 H 58.091396 Z" FillRule="NonZero"/>
</Path.Data>
</Path>
</Canvas>
</Canvas>
</Canvas>
</Viewbox>

<Viewbox x:Key="LassoIcon" x:Shared="False" Stretch="Uniform">
<Canvas Width="26.458333" Height="26.458334">
<Canvas.RenderTransform>
Expand Down Expand Up @@ -9808,6 +9935,74 @@
</Canvas>
</Viewbox>

<Viewbox x:Key="SpainIcon" x:Shared="False" Stretch="Uniform">
<Canvas Width="26.458333" Height="26.458334">
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="0"/>
</Canvas.RenderTransform>
<Canvas.Resources>
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="spain_linearGradient845" MappingMode="Absolute" StartPoint="27,77" EndPoint="7,28">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FFFF3D00" Offset="0"/>
<GradientStop Color="#FFFF5829" Offset="1"/>
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
<LinearGradientBrush.Transform>
<MatrixTransform Matrix="2.9999132 0 0 0.27924387 -4.3073772 18.855487"/>
</LinearGradientBrush.Transform>
</LinearGradientBrush>
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="spain_linearGradient853" MappingMode="Absolute" StartPoint="58,81" EndPoint="30,26">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FFFFC107" Offset="0"/>
<GradientStop Color="#FFFFCE3C" Offset="1"/>
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
<LinearGradientBrush.Transform>
<MatrixTransform Matrix="2.9999135 0 0 0.44151225 -88.210466 29.819252"/>
</LinearGradientBrush.Transform>
</LinearGradientBrush>
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="spain_linearGradient863-0" MappingMode="Absolute" StartPoint="86,81" EndPoint="58,26">
<LinearGradientBrush.GradientStops>
<GradientStopCollection>
<GradientStop Color="#FFFF3D00" Offset="0"/>
<GradientStop Color="#FFFF5829" Offset="1"/>
</GradientStopCollection>
</LinearGradientBrush.GradientStops>
<LinearGradientBrush.Transform>
<MatrixTransform Matrix="2.9998649 0 0 0.27924387 -172.11006 58.110955"/>
</LinearGradientBrush.Transform>
</LinearGradientBrush>
</Canvas.Resources>
<Canvas>
<Canvas.RenderTransform>
<TranslateTransform X="0" Y="-270.54165"/>
</Canvas.RenderTransform>
<Canvas Opacity="1">
<Canvas.RenderTransform>
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
</Canvas.RenderTransform>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="{StaticResource spain_linearGradient863-0}" StrokeThickness="8.93859" StrokeMiterLimit="4" StrokeLineJoin="Miter" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1">
<Path.Data>
<PathGeometry Figures="M 2.1562771 65.41617 H 86.05801 V 80.624989 H 2.1562771 Z" FillRule="NonZero"/>
</Path.Data>
</Path>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="{StaticResource spain_linearGradient845}" StrokeThickness="8.93857" StrokeMiterLimit="4" StrokeLineJoin="Miter" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1">
<Path.Data>
<PathGeometry Figures="M 2.1556011 26.160702 H 86.058686 V 41.369521 H 2.1556011 Z" FillRule="NonZero"/>
</Path.Data>
</Path>
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="{StaticResource spain_linearGradient853}" StrokeThickness="8.93857" StrokeMiterLimit="4" StrokeLineJoin="Miter" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1">
<Path.Data>
<PathGeometry Figures="M 2.1556012 41.369522 H 86.05869 v 24.04665 H 2.1556012 Z" FillRule="NonZero"/>
</Path.Data>
</Path>
</Canvas>
</Canvas>
</Canvas>
</Viewbox>

<Viewbox x:Key="SpeakerIcon" x:Shared="False" Stretch="Uniform">
<Canvas Width="26.458333" Height="26.458334">
<Canvas.RenderTransform>
Expand Down
6 changes: 3 additions & 3 deletions Express Apps/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports System
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices
Imports System.Globalization
Expand Down Expand Up @@ -55,5 +55,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("2.1.0.0")>
<Assembly: AssemblyFileVersion("2.1.0.0")>
<Assembly: AssemblyVersion("2.1.1.0")>
<Assembly: AssemblyFileVersion("2.1.1.0")>
6 changes: 3 additions & 3 deletions ExpressControls/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports System
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices
Imports System.Globalization
Expand Down Expand Up @@ -55,5 +55,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("2.1.1.0")>
<Assembly: AssemblyFileVersion("2.1.1.0")>
4 changes: 2 additions & 2 deletions ExpressControls/Themes/Generic.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
x:Name="stack">

<ContentControl Content="{x:Null}"
<ContentControl Content="{DynamicResource CircleUntickIcon}"
Focusable="False"
Margin="0,4,0,4"
Width="{TemplateBinding IconSize}"
Expand All @@ -301,7 +301,7 @@

<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Content" Value="{DynamicResource TickIcon}" TargetName="contp"/>
<Setter Property="Content" Value="{DynamicResource CircleTickIcon}" TargetName="contp"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="border" Value="{DynamicResource AppHoverColor}"/>
Expand Down
6 changes: 3 additions & 3 deletions Font Express/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports System
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices
Imports System.Globalization
Expand Down Expand Up @@ -55,5 +55,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("3.0.1.0")>
<Assembly: AssemblyFileVersion("3.0.1.0")>
<Assembly: AssemblyVersion("3.0.2.0")>
<Assembly: AssemblyFileVersion("3.0.2.0")>
6 changes: 3 additions & 3 deletions Present Express/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports System
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices
Imports System.Globalization
Expand Down Expand Up @@ -55,5 +55,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("2.0.1.0")>
<Assembly: AssemblyFileVersion("2.0.1.0")>
<Assembly: AssemblyVersion("2.0.2.0")>
<Assembly: AssemblyFileVersion("2.0.2.0")>
6 changes: 3 additions & 3 deletions Quota Express/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports System
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices
Imports System.Globalization
Expand Down Expand Up @@ -55,5 +55,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("3.0.1.0")>
<Assembly: AssemblyFileVersion("3.0.1.0")>
<Assembly: AssemblyVersion("3.0.2.0")>
<Assembly: AssemblyFileVersion("3.0.2.0")>
19 changes: 15 additions & 4 deletions Type Express/MainWindow.xaml.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,8 @@ Class MainWindow
End Sub

Private Sub WorkAreaChanged(sender As Object, e As EventArgs)
MaxHeight = SystemParameters.WorkArea.Height + 12
MaxWidth = SystemParameters.WorkArea.Width + 12
MaxHeight = SystemParameters.WorkArea.Height + 13
MaxWidth = SystemParameters.WorkArea.Width + 13

End Sub

Expand Down Expand Up @@ -1439,14 +1439,25 @@ Class MainWindow
TemplateSearchTxt.Focus()

If ThisFile = "" And DocTxt.Text = "" Then
SetTemplate(sender.Tag.ToString().Split(","))
If TypeOf sender.Tag Is String Then
SetTemplate(sender.Tag.ToString().Split(","))
Else
SetTemplate(sender.Tag)
End If

CloseMenuStoryboard.Begin()
TextFocus()

Else
Dim NewForm1 As New MainWindow
NewForm1.Show()
NewForm1.SetTemplate(sender.Tag.ToString().Split(","))

If TypeOf sender.Tag Is String Then
NewForm1.SetTemplate(sender.Tag.ToString().Split(","))
Else
NewForm1.SetTemplate(sender.Tag)
End If

NewForm1.MainTabs.SelectedIndex = 1
NewForm1.TextFocus()

Expand Down
6 changes: 3 additions & 3 deletions Type Express/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports System
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices
Imports System.Globalization
Expand Down Expand Up @@ -55,6 +55,6 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("5.1.0.0")>
<Assembly: AssemblyFileVersion("5.1.0.0")>
<Assembly: AssemblyVersion("5.1.1.0")>
<Assembly: AssemblyFileVersion("5.1.1.0")>
<Assembly: NeutralResourcesLanguage("en-GB")>

0 comments on commit dd61bf4

Please sign in to comment.