Skip to content

Commit dd61bf4

Browse files
john-dsjohn-ds
committed
v2.1.1
1 parent 63606b1 commit dd61bf4

File tree

9 files changed

+230
-24
lines changed

9 files changed

+230
-24
lines changed

‎Express Apps/ExpressIcons.xaml‎

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,6 +2085,74 @@
20852085
</Canvas>
20862086
</Viewbox>
20872087

2088+
<Viewbox x:Key="CircleTickIcon" x:Shared="False" Stretch="Uniform">
2089+
<Canvas Width="26.458333" Height="26.458334">
2090+
<Canvas.RenderTransform>
2091+
<TranslateTransform X="0" Y="0"/>
2092+
</Canvas.RenderTransform>
2093+
<Canvas.Resources>
2094+
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="circle_tick_linearGradient855" MappingMode="Absolute" StartPoint="78,87" EndPoint="2,11">
2095+
<LinearGradientBrush.GradientStops>
2096+
<GradientStopCollection>
2097+
<GradientStop Color="#FF50D18D" Offset="0"/>
2098+
<GradientStop Color="#FF9DFFCE" Offset="1"/>
2099+
</GradientStopCollection>
2100+
</LinearGradientBrush.GradientStops>
2101+
</LinearGradientBrush>
2102+
</Canvas.Resources>
2103+
<Canvas>
2104+
<Canvas.RenderTransform>
2105+
<TranslateTransform X="0" Y="-270.54165"/>
2106+
</Canvas.RenderTransform>
2107+
<Canvas Opacity="1">
2108+
<Canvas.RenderTransform>
2109+
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
2110+
</Canvas.RenderTransform>
2111+
<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">
2112+
<Path.Data>
2113+
<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"/>
2114+
</Path.Data>
2115+
</Path>
2116+
<Canvas>
2117+
<Canvas.RenderTransform>
2118+
<MatrixTransform Matrix="0.69625059 0 0 0.7492762 10.687115 13.381203"/>
2119+
</Canvas.RenderTransform>
2120+
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="#FF125933" StrokeThickness="0.999464" StrokeMiterLimit="4">
2121+
<Path.Data>
2122+
<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"/>
2123+
</Path.Data>
2124+
</Path>
2125+
</Canvas>
2126+
</Canvas>
2127+
</Canvas>
2128+
</Canvas>
2129+
</Viewbox>
2130+
2131+
<Viewbox x:Key="CircleUntickIcon" x:Shared="False" Stretch="Uniform">
2132+
<Canvas Width="26.458333" Height="26.458334">
2133+
<Canvas.RenderTransform>
2134+
<TranslateTransform X="0" Y="0"/>
2135+
</Canvas.RenderTransform>
2136+
<Canvas.Resources>
2137+
</Canvas.Resources>
2138+
<Canvas>
2139+
<Canvas.RenderTransform>
2140+
<TranslateTransform X="0" Y="-270.54165"/>
2141+
</Canvas.RenderTransform>
2142+
<Canvas Opacity="1">
2143+
<Canvas.RenderTransform>
2144+
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
2145+
</Canvas.RenderTransform>
2146+
<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StrokeThickness="6.13039" Stroke="#FF429E45" StrokeMiterLimit="4" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round">
2147+
<Path.Data>
2148+
<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"/>
2149+
</Path.Data>
2150+
</Path>
2151+
</Canvas>
2152+
</Canvas>
2153+
</Canvas>
2154+
</Viewbox>
2155+
20882156
<Viewbox x:Key="CloseIcon" x:Shared="False" Stretch="Uniform">
20892157
<Canvas Width="26.458333" Height="26.458334">
20902158
<Canvas.RenderTransform>
@@ -6349,6 +6417,65 @@
63496417
</Canvas>
63506418
</Viewbox>
63516419

6420+
<Viewbox x:Key="ItalyIcon" x:Shared="False" Stretch="Uniform">
6421+
<Canvas Width="26.458333" Height="26.458334">
6422+
<Canvas.RenderTransform>
6423+
<TranslateTransform X="0" Y="0"/>
6424+
</Canvas.RenderTransform>
6425+
<Canvas.Resources>
6426+
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="italy_linearGradient845" MappingMode="Absolute" StartPoint="27,77" EndPoint="7,28">
6427+
<LinearGradientBrush.GradientStops>
6428+
<GradientStopCollection>
6429+
<GradientStop Color="#FF689F38" Offset="0"/>
6430+
<GradientStop Color="#FF72AF3E" Offset="1"/>
6431+
</GradientStopCollection>
6432+
</LinearGradientBrush.GradientStops>
6433+
</LinearGradientBrush>
6434+
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="italy_linearGradient853" MappingMode="Absolute" StartPoint="58,81" EndPoint="30,26">
6435+
<LinearGradientBrush.GradientStops>
6436+
<GradientStopCollection>
6437+
<GradientStop Color="#FFECEFF1" Offset="0"/>
6438+
<GradientStop Color="#FFECEFFD" Offset="1"/>
6439+
</GradientStopCollection>
6440+
</LinearGradientBrush.GradientStops>
6441+
</LinearGradientBrush>
6442+
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="italy_linearGradient863" MappingMode="Absolute" StartPoint="86,81" EndPoint="58,26">
6443+
<LinearGradientBrush.GradientStops>
6444+
<GradientStopCollection>
6445+
<GradientStop Color="#FFFF3D00" Offset="0"/>
6446+
<GradientStop Color="#FFFF5829" Offset="1"/>
6447+
</GradientStopCollection>
6448+
</LinearGradientBrush.GradientStops>
6449+
</LinearGradientBrush>
6450+
</Canvas.Resources>
6451+
<Canvas>
6452+
<Canvas.RenderTransform>
6453+
<TranslateTransform X="0" Y="-270.54165"/>
6454+
</Canvas.RenderTransform>
6455+
<Canvas Opacity="1">
6456+
<Canvas.RenderTransform>
6457+
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
6458+
</Canvas.RenderTransform>
6459+
<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">
6460+
<Path.Data>
6461+
<PathGeometry Figures="M 2.1543884 26.160702 H 30.122892 V 80.624989 H 2.1543884 Z" FillRule="NonZero"/>
6462+
</Path.Data>
6463+
</Path>
6464+
<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">
6465+
<Path.Data>
6466+
<PathGeometry Figures="M 30.122892 26.160702 H 58.091396 V 80.624989 H 30.122892 Z" FillRule="NonZero"/>
6467+
</Path.Data>
6468+
</Path>
6469+
<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">
6470+
<Path.Data>
6471+
<PathGeometry Figures="M 58.091396 26.160702 H 86.0599 V 80.624989 H 58.091396 Z" FillRule="NonZero"/>
6472+
</Path.Data>
6473+
</Path>
6474+
</Canvas>
6475+
</Canvas>
6476+
</Canvas>
6477+
</Viewbox>
6478+
63526479
<Viewbox x:Key="LassoIcon" x:Shared="False" Stretch="Uniform">
63536480
<Canvas Width="26.458333" Height="26.458334">
63546481
<Canvas.RenderTransform>
@@ -9808,6 +9935,74 @@
98089935
</Canvas>
98099936
</Viewbox>
98109937

9938+
<Viewbox x:Key="SpainIcon" x:Shared="False" Stretch="Uniform">
9939+
<Canvas Width="26.458333" Height="26.458334">
9940+
<Canvas.RenderTransform>
9941+
<TranslateTransform X="0" Y="0"/>
9942+
</Canvas.RenderTransform>
9943+
<Canvas.Resources>
9944+
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="spain_linearGradient845" MappingMode="Absolute" StartPoint="27,77" EndPoint="7,28">
9945+
<LinearGradientBrush.GradientStops>
9946+
<GradientStopCollection>
9947+
<GradientStop Color="#FFFF3D00" Offset="0"/>
9948+
<GradientStop Color="#FFFF5829" Offset="1"/>
9949+
</GradientStopCollection>
9950+
</LinearGradientBrush.GradientStops>
9951+
<LinearGradientBrush.Transform>
9952+
<MatrixTransform Matrix="2.9999132 0 0 0.27924387 -4.3073772 18.855487"/>
9953+
</LinearGradientBrush.Transform>
9954+
</LinearGradientBrush>
9955+
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="spain_linearGradient853" MappingMode="Absolute" StartPoint="58,81" EndPoint="30,26">
9956+
<LinearGradientBrush.GradientStops>
9957+
<GradientStopCollection>
9958+
<GradientStop Color="#FFFFC107" Offset="0"/>
9959+
<GradientStop Color="#FFFFCE3C" Offset="1"/>
9960+
</GradientStopCollection>
9961+
</LinearGradientBrush.GradientStops>
9962+
<LinearGradientBrush.Transform>
9963+
<MatrixTransform Matrix="2.9999135 0 0 0.44151225 -88.210466 29.819252"/>
9964+
</LinearGradientBrush.Transform>
9965+
</LinearGradientBrush>
9966+
<LinearGradientBrush xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Key="spain_linearGradient863-0" MappingMode="Absolute" StartPoint="86,81" EndPoint="58,26">
9967+
<LinearGradientBrush.GradientStops>
9968+
<GradientStopCollection>
9969+
<GradientStop Color="#FFFF3D00" Offset="0"/>
9970+
<GradientStop Color="#FFFF5829" Offset="1"/>
9971+
</GradientStopCollection>
9972+
</LinearGradientBrush.GradientStops>
9973+
<LinearGradientBrush.Transform>
9974+
<MatrixTransform Matrix="2.9998649 0 0 0.27924387 -172.11006 58.110955"/>
9975+
</LinearGradientBrush.Transform>
9976+
</LinearGradientBrush>
9977+
</Canvas.Resources>
9978+
<Canvas>
9979+
<Canvas.RenderTransform>
9980+
<TranslateTransform X="0" Y="-270.54165"/>
9981+
</Canvas.RenderTransform>
9982+
<Canvas Opacity="1">
9983+
<Canvas.RenderTransform>
9984+
<MatrixTransform Matrix="0.26458333 0 0 0.26458333 1.5591518 269.64396"/>
9985+
</Canvas.RenderTransform>
9986+
<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">
9987+
<Path.Data>
9988+
<PathGeometry Figures="M 2.1562771 65.41617 H 86.05801 V 80.624989 H 2.1562771 Z" FillRule="NonZero"/>
9989+
</Path.Data>
9990+
</Path>
9991+
<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">
9992+
<Path.Data>
9993+
<PathGeometry Figures="M 2.1556011 26.160702 H 86.058686 V 41.369521 H 2.1556011 Z" FillRule="NonZero"/>
9994+
</Path.Data>
9995+
</Path>
9996+
<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">
9997+
<Path.Data>
9998+
<PathGeometry Figures="M 2.1556012 41.369522 H 86.05869 v 24.04665 H 2.1556012 Z" FillRule="NonZero"/>
9999+
</Path.Data>
10000+
</Path>
10001+
</Canvas>
10002+
</Canvas>
10003+
</Canvas>
10004+
</Viewbox>
10005+
981110006
<Viewbox x:Key="SpeakerIcon" x:Shared="False" Stretch="Uniform">
981210007
<Canvas Width="26.458333" Height="26.458334">
981310008
<Canvas.RenderTransform>

‎Express Apps/My Project/AssemblyInfo.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Imports System
1+
Imports System
22
Imports System.Reflection
33
Imports System.Runtime.InteropServices
44
Imports System.Globalization
@@ -55,5 +55,5 @@ Imports System.Windows
5555
' by using the '*' as shown below:
5656
' <Assembly: AssemblyVersion("1.0.*")>
5757

58-
<Assembly: AssemblyVersion("2.1.0.0")>
59-
<Assembly: AssemblyFileVersion("2.1.0.0")>
58+
<Assembly: AssemblyVersion("2.1.1.0")>
59+
<Assembly: AssemblyFileVersion("2.1.1.0")>

‎ExpressControls/My Project/AssemblyInfo.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Imports System
1+
Imports System
22
Imports System.Reflection
33
Imports System.Runtime.InteropServices
44
Imports System.Globalization
@@ -55,5 +55,5 @@ Imports System.Windows
5555
' by using the '*' as shown below:
5656
' <Assembly: AssemblyVersion("1.0.*")>
5757

58-
<Assembly: AssemblyVersion("1.0.0.0")>
59-
<Assembly: AssemblyFileVersion("1.0.0.0")>
58+
<Assembly: AssemblyVersion("2.1.1.0")>
59+
<Assembly: AssemblyFileVersion("2.1.1.0")>

‎ExpressControls/Themes/Generic.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
281281
x:Name="stack">
282282

283-
<ContentControl Content="{x:Null}"
283+
<ContentControl Content="{DynamicResource CircleUntickIcon}"
284284
Focusable="False"
285285
Margin="0,4,0,4"
286286
Width="{TemplateBinding IconSize}"
@@ -301,7 +301,7 @@
301301

302302
<ControlTemplate.Triggers>
303303
<Trigger Property="IsChecked" Value="True">
304-
<Setter Property="Content" Value="{DynamicResource TickIcon}" TargetName="contp"/>
304+
<Setter Property="Content" Value="{DynamicResource CircleTickIcon}" TargetName="contp"/>
305305
</Trigger>
306306
<Trigger Property="IsMouseOver" Value="True">
307307
<Setter Property="Background" TargetName="border" Value="{DynamicResource AppHoverColor}"/>

‎Font Express/My Project/AssemblyInfo.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Imports System
1+
Imports System
22
Imports System.Reflection
33
Imports System.Runtime.InteropServices
44
Imports System.Globalization
@@ -55,5 +55,5 @@ Imports System.Windows
5555
' by using the '*' as shown below:
5656
' <Assembly: AssemblyVersion("1.0.*")>
5757

58-
<Assembly: AssemblyVersion("3.0.1.0")>
59-
<Assembly: AssemblyFileVersion("3.0.1.0")>
58+
<Assembly: AssemblyVersion("3.0.2.0")>
59+
<Assembly: AssemblyFileVersion("3.0.2.0")>

‎Present Express/My Project/AssemblyInfo.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Imports System
1+
Imports System
22
Imports System.Reflection
33
Imports System.Runtime.InteropServices
44
Imports System.Globalization
@@ -55,5 +55,5 @@ Imports System.Windows
5555
' by using the '*' as shown below:
5656
' <Assembly: AssemblyVersion("1.0.*")>
5757

58-
<Assembly: AssemblyVersion("2.0.1.0")>
59-
<Assembly: AssemblyFileVersion("2.0.1.0")>
58+
<Assembly: AssemblyVersion("2.0.2.0")>
59+
<Assembly: AssemblyFileVersion("2.0.2.0")>

‎Quota Express/My Project/AssemblyInfo.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Imports System
1+
Imports System
22
Imports System.Reflection
33
Imports System.Runtime.InteropServices
44
Imports System.Globalization
@@ -55,5 +55,5 @@ Imports System.Windows
5555
' by using the '*' as shown below:
5656
' <Assembly: AssemblyVersion("1.0.*")>
5757

58-
<Assembly: AssemblyVersion("3.0.1.0")>
59-
<Assembly: AssemblyFileVersion("3.0.1.0")>
58+
<Assembly: AssemblyVersion("3.0.2.0")>
59+
<Assembly: AssemblyFileVersion("3.0.2.0")>

‎Type Express/MainWindow.xaml.vb‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ Class MainWindow
394394
End Sub
395395

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

400400
End Sub
401401

@@ -1439,14 +1439,25 @@ Class MainWindow
14391439
TemplateSearchTxt.Focus()
14401440

14411441
If ThisFile = "" And DocTxt.Text = "" Then
1442-
SetTemplate(sender.Tag.ToString().Split(","))
1442+
If TypeOf sender.Tag Is String Then
1443+
SetTemplate(sender.Tag.ToString().Split(","))
1444+
Else
1445+
SetTemplate(sender.Tag)
1446+
End If
1447+
14431448
CloseMenuStoryboard.Begin()
14441449
TextFocus()
14451450

14461451
Else
14471452
Dim NewForm1 As New MainWindow
14481453
NewForm1.Show()
1449-
NewForm1.SetTemplate(sender.Tag.ToString().Split(","))
1454+
1455+
If TypeOf sender.Tag Is String Then
1456+
NewForm1.SetTemplate(sender.Tag.ToString().Split(","))
1457+
Else
1458+
NewForm1.SetTemplate(sender.Tag)
1459+
End If
1460+
14501461
NewForm1.MainTabs.SelectedIndex = 1
14511462
NewForm1.TextFocus()
14521463

‎Type Express/My Project/AssemblyInfo.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Imports System
1+
Imports System
22
Imports System.Reflection
33
Imports System.Runtime.InteropServices
44
Imports System.Globalization
@@ -55,6 +55,6 @@ Imports System.Windows
5555
' by using the '*' as shown below:
5656
' <Assembly: AssemblyVersion("1.0.*")>
5757

58-
<Assembly: AssemblyVersion("5.1.0.0")>
59-
<Assembly: AssemblyFileVersion("5.1.0.0")>
58+
<Assembly: AssemblyVersion("5.1.1.0")>
59+
<Assembly: AssemblyFileVersion("5.1.1.0")>
6060
<Assembly: NeutralResourcesLanguage("en-GB")>

0 commit comments

Comments
 (0)