aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-10 11:38:50 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-10 11:38:50 +0300
commitafd359b383a09f720d512dbf1f3bb6707dc4b83e (patch)
tree950435d3dd35a268f44576330a2c9b0996ae97c2 /Software
parent17edf0cd108fb4a27dade328eaa294d352909b8f (diff)
downloadTango-afd359b383a09f720d512dbf1f3bb6707dc4b83e.tar.gz
Tango-afd359b383a09f720d512dbf1f3bb6707dc4b83e.zip
Implemented job type picker dialog.
Implemented "native" touch listbox.
Diffstat (limited to 'Software')
-rw-r--r--Software/DB/Tango.mdfbin75497472 -> 75497472 bytes
-rw-r--r--Software/DB/Tango_log.ldfbin1572864 -> 1572864 bytes
-rw-r--r--Software/Graphics/Mobile/ball-of-yarn.svg89
-rw-r--r--Software/Graphics/Mobile/embroidery.xaml54
-rw-r--r--Software/Graphics/Mobile/sewing-machine (1).svg7
-rw-r--r--Software/Graphics/Mobile/sewing-machine (1).xaml19
-rw-r--r--Software/Graphics/Mobile/sewing-machine.svg14
-rw-r--r--Software/Graphics/Mobile/sewing.xaml34
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml48
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml.cs32
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerViewVM.cs42
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj8
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs7
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml1
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs6
-rw-r--r--Software/Visual_Studio/Tango.BL/Enumerations/JobTypes.cs3
-rw-r--r--Software/Visual_Studio/Tango.Core/CustomAttributes/XamlVectorAttribute.cs30
-rw-r--r--Software/Visual_Studio/Tango.Core/Tango.Core.csproj1
-rw-r--r--Software/Visual_Studio/Tango.SharedUI/Converters/EnumToXamlVectorConverter.cs26
-rw-r--r--Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj1
-rw-r--r--Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs95
-rw-r--r--Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.xaml57
-rw-r--r--Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj5
-rw-r--r--Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml2
24 files changed, 577 insertions, 4 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index b9148d93d..180d6a4d6 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
Binary files differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index aa502ea4b..caf093b45 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
Binary files differ
diff --git a/Software/Graphics/Mobile/ball-of-yarn.svg b/Software/Graphics/Mobile/ball-of-yarn.svg
new file mode 100644
index 000000000..5b7bce46b
--- /dev/null
+++ b/Software/Graphics/Mobile/ball-of-yarn.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 55.193 55.193" style="enable-background:new 0 0 55.193 55.193;" xml:space="preserve">
+<g>
+ <path style="fill:#030104;" d="M52.59,0.016c-0.091,0.015-8.775,1.777-6.857,13.441c0.697,4.25,0.333,7.447-0.327,9.738
+ c-0.153,0.529-0.474,0.533-0.7,0.031C41.145,15.372,33.239,9.894,24.07,9.894c-12.488,0-22.649,10.16-22.649,22.647
+ c0,5.537,2,10.611,5.311,14.551c3.359,3.988,8.047,6.8,13.371,7.744c0.543,0.097,0.999,0.166,1.014,0.183
+ c0.014,0.014,0.035,0.019,0.048,0.006c0.013-0.015,0.467,0.037,1.017,0.084c0.623,0.056,1.253,0.084,1.89,0.084
+ c12.489,0,22.649-10.162,22.649-22.649c0-1.566-0.162-3.095-0.467-4.572c-0.111-0.541-0.004-1.365,0.229-1.865
+ c1.188-2.562,2.243-6.771,1.224-12.973c-1.592-9.684,4.975-11.098,5.249-11.15c0.543-0.102,0.9-0.625,0.8-1.168
+ C53.654,0.274,53.14-0.082,52.59,0.016z M33.746,13.964c0.852,0.445,1.667,0.943,2.443,1.496c0.449,0.32,0.49,0.922,0.097,1.309
+ c-0.396,0.389-0.797,0.768-1.204,1.137c-0.408,0.371-0.988,0.283-1.217-0.219c-0.346-0.756-0.695-1.799-0.9-3.17
+ C32.883,13.97,33.258,13.71,33.746,13.964z M27.723,12.922c0.083-0.545,0.632-0.901,1.169-0.774c0.32,0.076,0.637,0.16,0.95,0.25
+ c0.53,0.154,0.969,0.75,1.016,1.299c0.209,2.43,0.828,4.154,1.415,5.289c0.254,0.49,0.153,1.139-0.286,1.471
+ c-0.449,0.338-0.9,0.664-1.355,0.981c-0.453,0.316-1.076,0.189-1.343-0.295C28.345,19.436,27.176,16.473,27.723,12.922z
+ M22.186,12.655c0.048-0.551,0.504-1.031,0.994-1.059c0.294-0.016,0.59-0.025,0.888-0.025c0.312,0,0.622,0.01,0.929,0.025
+ c0.515,0.029,0.825,0.505,0.741,1.05c-0.643,4.18,0.742,7.613,1.855,9.576c0.272,0.481,0.139,1.086-0.339,1.365
+ c-0.483,0.281-0.97,0.555-1.455,0.818c-0.485,0.262-1.127,0.092-1.392-0.395C23.307,21.992,21.724,18.047,22.186,12.655z
+ M17.976,12.497c0.426-0.131,0.857-0.25,1.295-0.353c0.537-0.129,0.929,0.238,0.891,0.789c-0.39,5.629,1.227,9.746,2.442,11.973
+ c0.265,0.486,0.101,1.057-0.403,1.283c-0.533,0.24-1.063,0.469-1.591,0.688c-0.51,0.212-1.122-0.026-1.338-0.536l0,0
+ c-0.963-2.266-2.424-6.709-2.284-12.529C17.002,13.261,17.448,12.66,17.976,12.497z M12.365,15.179
+ c0.559-0.379,1.138-0.73,1.734-1.055c0.485-0.264,0.877-0.01,0.877,0.543c0.008,5.695,1.42,10.033,2.42,12.389
+ c0.216,0.508-0.01,1.065-0.532,1.244c-0.554,0.191-1.1,0.371-1.637,0.541c-0.526,0.166-1.221-0.067-1.488-0.552
+ c-0.939-1.693-2.278-5.226-2.21-11.531C11.535,16.205,11.907,15.488,12.365,15.179z M7.357,19.9
+ c0.459-0.602,0.95-1.178,1.471-1.729c0.379-0.4,0.704-0.261,0.721,0.292c0.154,5.195,1.251,8.475,2.215,10.377
+ c0.249,0.492,0.055,0.988-0.482,1.123c-0.548,0.137-1.079,0.264-1.59,0.379c-0.538,0.123-1.249-0.146-1.476-0.649
+ c-0.982-2.184-1.305-6.137-1.404-7.984C6.783,21.158,7.022,20.34,7.357,19.9z M4.69,24.589c0.21-0.512,0.415-0.467,0.458,0.084
+ c0.176,2.293,0.668,4.087,1.148,5.356c0.195,0.517-0.055,1.004-0.601,1.093c-0.589,0.096-1.108,0.17-1.551,0.229
+ c-0.547,0.071-0.971-0.326-0.918-0.877C3.429,28.41,3.93,26.435,4.69,24.589z M3.664,37.301c-0.213-0.916-0.363-1.856-0.45-2.813
+ c-0.05-0.551,0.378-1.041,0.925-1.106c5.164-0.627,21.761-3.496,33.653-15.285c0.394-0.389,0.606-0.805,0.489-0.918
+ c-0.118-0.113,0.121,0.092,0.514,0.479c0.618,0.609,1.198,1.256,1.736,1.938c0.343,0.433,0.332,1.157-0.014,1.587
+ C29.634,34.734,10.822,37.607,4.908,38.185C4.359,38.238,3.788,37.84,3.664,37.301z M6.722,44.275
+ c-0.669-0.983-1.258-2.026-1.754-3.121c-0.228-0.502,0.056-0.955,0.605-1.01c6.594-0.654,24.837-3.668,36.073-17.188
+ c0.354-0.424,0.854-0.391,1.105,0.1c0.377,0.734,0.715,1.492,1.006,2.273c0.19,0.518,0.071,1.316-0.25,1.766
+ C36.633,36.644,26.531,41.131,18.65,43.24c-0.533,0.142-1.049,0.25-1.148,0.25c-0.101,0-0.182,0.021-0.181,0.043
+ c0.001,0.025-0.434,0.15-0.973,0.271c-3.505,0.786-6.38,1.1-8.047,1.223C7.75,45.068,7.032,44.732,6.722,44.275z M13.037,50.362
+ c-1.236-0.771-2.384-1.668-3.431-2.67c-0.399-0.382-0.259-0.745,0.29-0.804c0.482-0.05,1.012-0.111,1.584-0.189
+ c0.548-0.071,1.057,0.304,1.178,0.843c0.21,0.928,0.49,1.735,0.797,2.432C13.68,50.477,13.506,50.653,13.037,50.362z
+ M18.761,52.823c-0.387-0.104-0.768-0.219-1.145-0.346c-0.523-0.173-1.208-0.696-1.479-1.18c-0.458-0.812-1.107-2.198-1.514-4.086
+ c-0.116-0.539,0.261-1.063,0.802-1.174c0.336-0.067,0.68-0.141,1.028-0.217c0.539-0.119,1.017,0.223,1.097,0.77
+ c0.341,2.345,1.025,4.209,1.709,5.586C19.505,52.67,19.294,52.967,18.761,52.823z M25.493,53.46
+ c-0.471,0.035-0.945,0.057-1.425,0.057c-0.282,0-0.562-0.01-0.842-0.025c-0.463-0.029-1.121-0.408-1.42-0.873
+ c-0.767-1.185-1.883-3.373-2.307-6.523c-0.074-0.549,0.324-1.111,0.854-1.266c0.669-0.193,1.351-0.404,2.042-0.634
+ c0.525-0.172,1.023,0.119,1.131,0.662c0.738,3.72,1.667,6.123,2.464,7.64C26.247,52.984,26.044,53.419,25.493,53.46z
+ M31.623,52.092c-0.643,0.25-1.301,0.467-1.974,0.652c-0.532,0.147-1.252-0.106-1.538-0.58c-0.744-1.232-1.843-3.65-2.68-8.017
+ c-0.104-0.541,0.237-1.146,0.748-1.354c0.686-0.283,1.375-0.584,2.066-0.904c0.502-0.232,0.944,0.016,1.012,0.564
+ c0.542,4.375,1.689,6.973,2.688,8.459C32.254,51.37,32.138,51.892,31.623,52.092z M37.388,48.702
+ c-0.672,0.557-1.379,1.073-2.116,1.545c-0.466,0.297-1.181,0.202-1.503-0.244c-0.875-1.217-2.123-3.732-2.613-8.535
+ c-0.057-0.549,0.307-1.209,0.785-1.483c0.484-0.276,0.969-0.563,1.449-0.862c0.471-0.291,0.853-0.091,0.901,0.461
+ c0.332,3.643,1.921,6.217,3.181,7.723C37.827,47.727,37.814,48.35,37.388,48.702z M41.792,43.713
+ c-0.479,0.754-1.007,1.476-1.575,2.16c-0.353,0.424-0.972,0.437-1.318,0.006c-1.176-1.455-2.672-4.028-2.674-7.696
+ c0-0.552,0.395-1.267,0.83-1.606c0.51-0.396,1.017-0.807,1.519-1.234c0.421-0.356,0.769-0.209,0.821,0.343
+ c0.306,3.144,1.393,5.209,2.273,6.401C41.996,42.532,42.088,43.247,41.792,43.713z M43.663,39.995
+ c-0.196,0.516-0.651,0.567-0.925,0.088c-0.727-1.273-1.464-3.316-1.432-6.324c0.006-0.553,0.353-1.318,0.729-1.723
+ c0.6-0.646,1.186-1.314,1.753-2.017c0.349-0.429,0.688-0.854,0.771-0.94c0.082-0.089,0.227,0.28,0.3,0.827
+ c0.114,0.863,0.183,1.742,0.183,2.638C45.041,35.169,44.551,37.676,43.663,39.995z"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/Software/Graphics/Mobile/embroidery.xaml b/Software/Graphics/Mobile/embroidery.xaml
new file mode 100644
index 000000000..366f71237
--- /dev/null
+++ b/Software/Graphics/Mobile/embroidery.xaml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+ <Canvas Name="svg20" Width="446.978" Height="446.978">
+ <Canvas.RenderTransform>
+ <TranslateTransform X="0" Y="0"/>
+ </Canvas.RenderTransform>
+ <Canvas.Resources/>
+ <!--Unknown tag: metadata-->
+ <!--Unknown tag: sodipodi:namedview-->
+ <Canvas Name="g18">
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path2" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path4" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path8" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path10" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path14" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path16" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ </Canvas>
+ </Canvas>
+</Viewbox>
diff --git a/Software/Graphics/Mobile/sewing-machine (1).svg b/Software/Graphics/Mobile/sewing-machine (1).svg
new file mode 100644
index 000000000..41a171227
--- /dev/null
+++ b/Software/Graphics/Mobile/sewing-machine (1).svg
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 512 512">
+ <g>
+ <path d="m433.9,382.9v-295.4c0-41.6-34.3-75.9-75.9-75.9h-205c-41.6,0-75.9,34.3-75.9,75.9v10.4h35.4v71.8h32.3v98.8h20.8v-98.8h32.3v-71.8h130v226.8h-270.6v58.3h-41.6v117.6h480.6v-117.7h-62.4zm-255.9-233h-44.7v-52h44.7v52zm-99.9,194.5h270.5v-267.3h-250.7c5.2-26 28.1-45.8 55.1-45.8h205c31.2,0 56.2,25 56.2,56.2v295.5h-336v-38.6zm397.3,135.3h-439v-77h439v77z"/>
+ </g>
+</svg>
diff --git a/Software/Graphics/Mobile/sewing-machine (1).xaml b/Software/Graphics/Mobile/sewing-machine (1).xaml
new file mode 100644
index 000000000..d07e2910f
--- /dev/null
+++ b/Software/Graphics/Mobile/sewing-machine (1).xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+ <Canvas Name="svg6" Width="512" Height="512">
+ <Canvas.RenderTransform>
+ <TranslateTransform X="0" Y="0"/>
+ </Canvas.RenderTransform>
+ <Canvas.Resources/>
+ <!--Unknown tag: metadata-->
+ <!--Unknown tag: sodipodi:namedview-->
+ <Canvas Name="g4">
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path2" Fill="#000000">
+ <Path.Data>
+ <PathGeometry Figures="" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ </Canvas>
+ </Canvas>
+</Viewbox>
diff --git a/Software/Graphics/Mobile/sewing-machine.svg b/Software/Graphics/Mobile/sewing-machine.svg
new file mode 100644
index 000000000..42d06ec3a
--- /dev/null
+++ b/Software/Graphics/Mobile/sewing-machine.svg
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 446.978 446.978" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 446.978 446.978">
+ <g>
+ <path d="m396.212,80.894h-38.218v-44.272c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v44.272h-20.594v-19.178c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v19.178h-209.887v-26.475c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v26.476h-31.747c-27.993-0.001-50.766,22.773-50.766,50.765v67.168c0,27.993 22.773,50.766 50.766,50.766h21.303v29.711c0,2.761 2.239,5 5,5h7.943v19.269c0,2.761 2.239,5 5,5s5-2.239 5-5v-19.269h7.943c2.761,0 5-2.239 5-5v-29.711h42.998c2.701,0 5.193-1.452 6.525-3.802l16.182-28.556h80.35v114.432h-246.51c-4.142,0-7.5,3.358-7.5,7.5v71.188c0,4.142 3.358,7.5 7.5,7.5h431.978c4.142,0 7.5-3.358 7.5-7.5v-278.696c0-27.992-22.773-50.766-50.766-50.766zm-317.379,109.575h22.358v9.415h-22.358v-9.415zm22.358-10h-22.358v-61.188h22.358v61.188zm0-71.188h-22.358v-13.387h22.358v13.387zm-3.235,165.025h-15.887v-24.711h15.886v24.711zm163.555,72.363c4.142,0 7.5-3.358 7.5-7.5v-129.432c0-4.142-3.358-7.5-7.5-7.5h-92.22c-2.701,0-5.193,1.453-6.525,3.802l-16.182,28.556h-95.817c-19.722,0-35.766-16.044-35.766-35.766v-67.169c0-19.722 16.044-35.766 35.766-35.766h18.067v108.989c0,2.761 2.239,5 5,5h32.358c2.761,0 5-2.239 5-5v-108.989h285.021c19.722,0 35.766,16.044 35.766,35.766v223.541h-416.978v-8.533h246.51zm-246.51,56.188v-37.655h416.978v37.655h-416.978z"/>
+ <path d="m278.083,208.776v33.859c0,39.928 32.483,72.411 72.411,72.411 39.928,0 72.411-32.483 72.411-72.411v-110.975c0-14.719-11.974-26.693-26.693-26.693h-140.905c-24.316,0-44.098,19.782-44.098,44.098s19.782,44.098 44.098,44.098h7.164c8.608,0.001 15.612,7.004 15.612,15.613zm-22.776-25.612c-18.802,0-34.098-15.296-34.098-34.098s15.296-34.098 34.098-34.098h140.906c9.205,0 16.693,7.488 16.693,16.693v110.975c0,34.414-27.998,62.411-62.412,62.411-34.414,0-62.411-27.998-62.411-62.411v-33.859c0-14.123-11.489-25.612-25.612-25.612h-7.164z"/>
+ <path d="m350.494,285.905c10.396,0 20.791-3.957 28.705-11.87 15.828-15.828 15.828-41.581 0-57.409-15.829-15.828-41.581-15.827-57.409,0-15.827,15.828-15.827,41.581 0,57.409 7.914,7.913 18.309,11.87 28.704,11.87zm-21.633-62.208c5.964-5.964 13.799-8.946 21.633-8.946 7.834,0 15.668,2.982 21.633,8.946 11.929,11.928 11.929,31.338 0,43.266-11.929,11.928-31.338,11.928-43.266,0-11.928-11.928-11.928-31.338 5.68434e-14-43.266z"/>
+ <path d="m258.274,125.46c-12.57,0-22.797,10.227-22.797,22.796 0,12.57 10.227,22.797 22.797,22.797s22.797-10.227 22.797-22.797c0-12.569-10.227-22.796-22.797-22.796zm0,35.593c-7.056,0-12.797-5.741-12.797-12.797s5.741-12.796 12.797-12.796 12.797,5.74 12.797,12.796-5.741,12.797-12.797,12.797z"/>
+ <path d="m172.525,115.753h-37.212c-2.761,0-5,2.239-5,5v51.772c0,2.761 2.239,5 5,5h37.212c2.761,0 5-2.239 5-5v-51.772c2.84217e-14-2.762-2.238-5-5-5zm-5,51.772h-27.212v-41.772h27.212v41.772z"/>
+ <path d="m336.262,238.598c1.98,0 3.91-0.8 5.31-2.19 1.39-1.4 2.19-3.33 2.19-5.31 0-1.97-0.8-3.9-2.19-5.3-1.4-1.4-3.33-2.2-5.31-2.2-1.97,0-3.9,0.8-5.3,2.2-1.4,1.4-2.2,3.33-2.2,5.3 0,1.98 0.8,3.91 2.2,5.31 1.4,1.39 3.33,2.19 5.3,2.19z"/>
+ <path d="m325.745,143.507h49.498c2.761,0 5-2.239 5-5s-2.239-5-5-5h-49.498c-2.761,0-5,2.239-5,5s2.239,5 5,5z"/>
+ <path d="m325.745,163.006h49.498c2.761,0 5-2.239 5-5s-2.239-5-5-5h-49.498c-2.761,0-5,2.239-5,5s2.239,5 5,5z"/>
+ </g>
+</svg>
diff --git a/Software/Graphics/Mobile/sewing.xaml b/Software/Graphics/Mobile/sewing.xaml
new file mode 100644
index 000000000..22f138236
--- /dev/null
+++ b/Software/Graphics/Mobile/sewing.xaml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+ <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="55.193" Height="55.193">
+ <Canvas.RenderTransform>
+ <TranslateTransform X="0" Y="0"/>
+ </Canvas.RenderTransform>
+ <Canvas.Resources/>
+ <!--Unknown tag: metadata-->
+ <!--Unknown tag: sodipodi:namedview-->
+ <Canvas Name="g4">
+ <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path2" Fill="#FF030104">
+ <Path.Data>
+ <PathGeometry Figures="M52.59 0.016c-0.091 0.015-8.775 1.777-6.857 13.441c0.697 4.25 0.333 7.447-0.327 9.738 c-0.153 0.529-0.474 0.533-0.7 0.031C41.145 15.372 33.239 9.894 24.07 9.894c-12.488 0-22.649 10.16-22.649 22.647 c0 5.537 2 10.611 5.311 14.551c3.359 3.988 8.047 6.8 13.371 7.744c0.543 0.097 0.999 0.166 1.014 0.183 c0.014 0.014 0.035 0.019 0.048 0.006c0.013-0.015 0.467 0.037 1.017 0.084c0.623 0.056 1.253 0.084 1.89 0.084 c12.489 0 22.649-10.162 22.649-22.649c0-1.566-0.162-3.095-0.467-4.572c-0.111-0.541-0.004-1.365 0.229-1.865 c1.188-2.562 2.243-6.771 1.224-12.973c-1.592-9.684 4.975-11.098 5.249-11.15c0.543-0.102 0.9-0.625 0.8-1.168 C53.654 0.274 53.14-0.082 52.59 0.016z M33.746 13.964c0.852 0.445 1.667 0.943 2.443 1.496c0.449 0.32 0.49 0.922 0.097 1.309 c-0.396 0.389-0.797 0.768-1.204 1.137c-0.408 0.371-0.988 0.283-1.217-0.219c-0.346-0.756-0.695-1.799-0.9-3.17 C32.883 13.97 33.258 13.71 33.746 13.964z M27.723 12.922c0.083-0.545 0.632-0.901 1.169-0.774c0.32 0.076 0.637 0.16 0.95 0.25 c0.53 0.154 0.969 0.75 1.016 1.299c0.209 2.43 0.828 4.154 1.415 5.289c0.254 0.49 0.153 1.139-0.286 1.471 c-0.449 0.338-0.9 0.664-1.355 0.981c-0.453 0.316-1.076 0.189-1.343-0.295C28.345 19.436 27.176 16.473 27.723 12.922z M22.186 12.655c0.048-0.551 0.504-1.031 0.994-1.059c0.294-0.016 0.59-0.025 0.888-0.025c0.312 0 0.622 0.01 0.929 0.025 c0.515 0.029 0.825 0.505 0.741 1.05c-0.643 4.18 0.742 7.613 1.855 9.576c0.272 0.481 0.139 1.086-0.339 1.365 c-0.483 0.281-0.97 0.555-1.455 0.818c-0.485 0.262-1.127 0.092-1.392-0.395C23.307 21.992 21.724 18.047 22.186 12.655z M17.976 12.497c0.426-0.131 0.857-0.25 1.295-0.353c0.537-0.129 0.929 0.238 0.891 0.789c-0.39 5.629 1.227 9.746 2.442 11.973 c0.265 0.486 0.101 1.057-0.403 1.283c-0.533 0.24-1.063 0.469-1.591 0.688c-0.51 0.212-1.122-0.026-1.338-0.536l0 0 c-0.963-2.266-2.424-6.709-2.284-12.529C17.002 13.261 17.448 12.66 17.976 12.497z M12.365 15.179 c0.559-0.379 1.138-0.73 1.734-1.055c0.485-0.264 0.877-0.01 0.877 0.543c0.008 5.695 1.42 10.033 2.42 12.389 c0.216 0.508-0.01 1.065-0.532 1.244c-0.554 0.191-1.1 0.371-1.637 0.541c-0.526 0.166-1.221-0.067-1.488-0.552 c-0.939-1.693-2.278-5.226-2.21-11.531C11.535 16.205 11.907 15.488 12.365 15.179z M7.357 19.9 c0.459-0.602 0.95-1.178 1.471-1.729c0.379-0.4 0.704-0.261 0.721 0.292c0.154 5.195 1.251 8.475 2.215 10.377 c0.249 0.492 0.055 0.988-0.482 1.123c-0.548 0.137-1.079 0.264-1.59 0.379c-0.538 0.123-1.249-0.146-1.476-0.649 c-0.982-2.184-1.305-6.137-1.404-7.984C6.783 21.158 7.022 20.34 7.357 19.9z M4.69 24.589c0.21-0.512 0.415-0.467 0.458 0.084 c0.176 2.293 0.668 4.087 1.148 5.356c0.195 0.517-0.055 1.004-0.601 1.093c-0.589 0.096-1.108 0.17-1.551 0.229 c-0.547 0.071-0.971-0.326-0.918-0.877C3.429 28.41 3.93 26.435 4.69 24.589z M3.664 37.301c-0.213-0.916-0.363-1.856-0.45-2.813 c-0.05-0.551 0.378-1.041 0.925-1.106c5.164-0.627 21.761-3.496 33.653-15.285c0.394-0.389 0.606-0.805 0.489-0.918 c-0.118-0.113 0.121 0.092 0.514 0.479c0.618 0.609 1.198 1.256 1.736 1.938c0.343 0.433 0.332 1.157-0.014 1.587 C29.634 34.734 10.822 37.607 4.908 38.185C4.359 38.238 3.788 37.84 3.664 37.301z M6.722 44.275 c-0.669-0.983-1.258-2.026-1.754-3.121c-0.228-0.502 0.056-0.955 0.605-1.01c6.594-0.654 24.837-3.668 36.073-17.188 c0.354-0.424 0.854-0.391 1.105 0.1c0.377 0.734 0.715 1.492 1.006 2.273c0.19 0.518 0.071 1.316-0.25 1.766 C36.633 36.644 26.531 41.131 18.65 43.24c-0.533 0.142-1.049 0.25-1.148 0.25c-0.101 0-0.182 0.021-0.181 0.043 c0.001 0.025-0.434 0.15-0.973 0.271c-3.505 0.786-6.38 1.1-8.047 1.223C7.75 45.068 7.032 44.732 6.722 44.275z M13.037 50.362 c-1.236-0.771-2.384-1.668-3.431-2.67c-0.399-0.382-0.259-0.745 0.29-0.804c0.482-0.05 1.012-0.111 1.584-0.189 c0.548-0.071 1.057 0.304 1.178 0.843c0.21 0.928 0.49 1.735 0.797 2.432C13.68 50.477 13.506 50.653 13.037 50.362z M18.761 52.823c-0.387-0.104-0.768-0.219-1.145-0.346c-0.523-0.173-1.208-0.696-1.479-1.18c-0.458-0.812-1.107-2.198-1.514-4.086 c-0.116-0.539 0.261-1.063 0.802-1.174c0.336-0.067 0.68-0.141 1.028-0.217c0.539-0.119 1.017 0.223 1.097 0.77 c0.341 2.345 1.025 4.209 1.709 5.586C19.505 52.67 19.294 52.967 18.761 52.823z M25.493 53.46 c-0.471 0.035-0.945 0.057-1.425 0.057c-0.282 0-0.562-0.01-0.842-0.025c-0.463-0.029-1.121-0.408-1.42-0.873 c-0.767-1.185-1.883-3.373-2.307-6.523c-0.074-0.549 0.324-1.111 0.854-1.266c0.669-0.193 1.351-0.404 2.042-0.634 c0.525-0.172 1.023 0.119 1.131 0.662c0.738 3.72 1.667 6.123 2.464 7.64C26.247 52.984 26.044 53.419 25.493 53.46z M31.623 52.092c-0.643 0.25-1.301 0.467-1.974 0.652c-0.532 0.147-1.252-0.106-1.538-0.58c-0.744-1.232-1.843-3.65-2.68-8.017 c-0.104-0.541 0.237-1.146 0.748-1.354c0.686-0.283 1.375-0.584 2.066-0.904c0.502-0.232 0.944 0.016 1.012 0.564 c0.542 4.375 1.689 6.973 2.688 8.459C32.254 51.37 32.138 51.892 31.623 52.092z M37.388 48.702 c-0.672 0.557-1.379 1.073-2.116 1.545c-0.466 0.297-1.181 0.202-1.503-0.244c-0.875-1.217-2.123-3.732-2.613-8.535 c-0.057-0.549 0.307-1.209 0.785-1.483c0.484-0.276 0.969-0.563 1.449-0.862c0.471-0.291 0.853-0.091 0.901 0.461 c0.332 3.643 1.921 6.217 3.181 7.723C37.827 47.727 37.814 48.35 37.388 48.702z M41.792 43.713 c-0.479 0.754-1.007 1.476-1.575 2.16c-0.353 0.424-0.972 0.437-1.318 0.006c-1.176-1.455-2.672-4.028-2.674-7.696 c0-0.552 0.395-1.267 0.83-1.606c0.51-0.396 1.017-0.807 1.519-1.234c0.421-0.356 0.769-0.209 0.821 0.343 c0.306 3.144 1.393 5.209 2.273 6.401C41.996 42.532 42.088 43.247 41.792 43.713z M43.663 39.995 c-0.196 0.516-0.651 0.567-0.925 0.088c-0.727-1.273-1.464-3.316-1.432-6.324c0.006-0.553 0.353-1.318 0.729-1.723 c0.6-0.646 1.186-1.314 1.753-2.017c0.349-0.429 0.688-0.854 0.771-0.94c0.082-0.089 0.227 0.28 0.3 0.827 c0.114 0.863 0.183 1.742 0.183 2.638C45.041 35.169 44.551 37.676 43.663 39.995z" FillRule="NonZero"/>
+ </Path.Data>
+ </Path>
+ </Canvas>
+ <Canvas Name="g6"/>
+ <Canvas Name="g8"/>
+ <Canvas Name="g10"/>
+ <Canvas Name="g12"/>
+ <Canvas Name="g14"/>
+ <Canvas Name="g16"/>
+ <Canvas Name="g18"/>
+ <Canvas Name="g20"/>
+ <Canvas Name="g22"/>
+ <Canvas Name="g24"/>
+ <Canvas Name="g26"/>
+ <Canvas Name="g28"/>
+ <Canvas Name="g30"/>
+ <Canvas Name="g32"/>
+ <Canvas Name="g34"/>
+ </Canvas>
+</Viewbox>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml
new file mode 100644
index 000000000..07a662c77
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml
@@ -0,0 +1,48 @@
+<UserControl x:Class="Tango.PPC.Jobs.Dialogs.JobTypePickerView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="clr-namespace:Tango.PPC.Jobs.Dialogs"
+ xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
+ xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+ xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+ mc:Ignorable="d"
+ Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="500" Height="400" d:DataContext="{d:DesignInstance Type=local:JobTypePickerViewVM, IsDesignTimeCreatable=False}">
+
+ <UserControl.Resources>
+ <converters:EnumToXamlVectorConverter x:Key="EnumToXamlVectorConverter" />
+ </UserControl.Resources>
+
+ <Grid>
+ <Grid Margin="20">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="40"/>
+ <RowDefinition Height="1*"/>
+ <RowDefinition Height="60"/>
+ </Grid.RowDefinitions>
+
+ <TextBlock VerticalAlignment="Center" Text="Select Job Type" FontSize="{StaticResource TangoMessageBoxTitleFontSize}"></TextBlock>
+
+ <touch:TouchNativeListBox RippleFactor="10" Grid.Row="1" Margin="0 15 0 0" ItemsSource="{Binding Source={x:Type enumerations:JobTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValuePath="Value" SelectedValue="{Binding SelectedJobType,Mode=OneWayToSource}" SelectedIndex="-1">
+ <ListBox.ItemTemplate>
+ <DataTemplate>
+ <Border Padding="0 15">
+ <StackPanel Orientation="Horizontal">
+ <Path Stretch="Fill" Fill="{StaticResource TangoDarkForegroundBrush}" Data="{Binding Value,Converter={StaticResource EnumToXamlVectorConverter}}" Width="60" Height="60"></Path>
+ <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Text="{Binding DisplayName}" FontSize="{StaticResource TangoButtonFontSize}"></TextBlock>
+ </StackPanel>
+ </Border>
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+ </touch:TouchNativeListBox>
+
+ <Grid Grid.Row="3">
+ <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+ <touch:TouchButton Command="{Binding CloseCommand}" CornerRadius="25" Style="{StaticResource TangoHollowButton}" Width="170" Height="50" VerticalAlignment="Bottom">CLOSE</touch:TouchButton>
+ </StackPanel>
+ </Grid>
+ </Grid>
+ </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml.cs
new file mode 100644
index 000000000..cf5725685
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerView.xaml.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.BL.Enumerations;
+
+namespace Tango.PPC.Jobs.Dialogs
+{
+ /// <summary>
+ /// Interaction logic for JobTypePickerView.xaml
+ /// </summary>
+ public partial class JobTypePickerView : UserControl
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="JobTypePickerView"/> class.
+ /// </summary>
+ public JobTypePickerView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerViewVM.cs
new file mode 100644
index 000000000..ead969126
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/JobTypePickerViewVM.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Enumerations;
+using Tango.SharedUI;
+
+namespace Tango.PPC.Jobs.Dialogs
+{
+ /// <summary>
+ /// Represents the a job type picker view model
+ /// </summary>
+ /// <seealso cref="Tango.SharedUI.DialogViewVM" />
+ public class JobTypePickerViewVM : DialogViewVM
+ {
+ private JobTypes? _selectedJobType;
+ /// <summary>
+ /// Gets or sets the type of the selected job.
+ /// </summary>
+ public JobTypes? SelectedJobType
+ {
+ get { return _selectedJobType; }
+ set
+ {
+ _selectedJobType = value;
+ OnSelectedJobTypeChanged();
+ }
+ }
+
+ /// <summary>
+ /// Called when the selected job type has been changed
+ /// </summary>
+ private void OnSelectedJobTypeChanged()
+ {
+ if (SelectedJobType.HasValue)
+ {
+ Accept();
+ }
+ }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 0a151b54b..0163b77c2 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -84,6 +84,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Dialogs\JobTypePickerView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Resources\Styles.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -138,6 +142,10 @@
<DependentUpon>BasicColorCorrectionView.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\BasicColorCorrectionViewVM.cs" />
+ <Compile Include="Dialogs\JobTypePickerView.xaml.cs">
+ <DependentUpon>JobTypePickerView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Dialogs\JobTypePickerViewVM.cs" />
<Compile Include="JobsModule.cs" />
<Compile Include="JobsModuleSettings.cs" />
<Compile Include="Messages\JobRemovedMessage.cs" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index d2c229187..39963201e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -15,6 +15,7 @@ using Tango.Core.Commands;
using Tango.Core.DI;
using Tango.DragAndDrop;
using Tango.PPC.Common;
+using Tango.PPC.Jobs.Dialogs;
using Tango.PPC.Jobs.Messages;
using Tango.PPC.Jobs.Views;
@@ -263,11 +264,15 @@ namespace Tango.PPC.Jobs.ViewModels
/// </summary>
private async void AddNewJob()
{
+ var vm = await NotificationProvider.ShowDialog<JobTypePickerViewVM>();
+
+ if (!vm.DialogResult) return;
+
Job job = new Job();
job.Name = "untitled";
job.CreationDate = DateTime.UtcNow;
job.JobStatus = JobStatuses.Draft;
- job.JobType = JobTypes.Sewing;
+ job.JobType = vm.SelectedJobType.Value;
job.ColorSpaceGuid = Adapter.ColorSpaces.FirstOrDefault(x => x.Code == ColorSpaces.RGB.ToInt32()).Guid;
job.MachineGuid = ApplicationManager.Machine.Guid;
job.UserGuid = AuthenticationProvider.CurrentUser.Guid;
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 21e37307f..7115b6557 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -36,6 +36,7 @@
<converters:WidthHeightToRectConverter x:Key="WidthHeightToRectConverter" />
<converters:OneToPercentConverter x:Key="OneToPercentConverter" />
<converters:SmallerThanToBooleanConverter x:Key="SmallerThanToBooleanConverter" />
+ <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
<Style TargetType="FrameworkElement">
<Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 65ee12124..c9d0ab35c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -192,9 +192,9 @@ namespace Tango.PPC.UI.PPCApplication
private async void ConnectToMachine()
{
- var machine = new MachineOperator(new UsbTransportAdapter("COM3", UsbSerialBaudRates.BR_9600));
- await machine.Connect();
- ConnectedMachine = machine;
+ //var machine = new MachineOperator(new UsbTransportAdapter("COM3", UsbSerialBaudRates.BR_9600));
+ //await machine.Connect();
+ //ConnectedMachine = machine;
}
}
}
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/JobTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/JobTypes.cs
index 8da45c813..480367939 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/JobTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/JobTypes.cs
@@ -3,12 +3,15 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Tango.Core.CustomAttributes;
namespace Tango.BL.Enumerations
{
public enum JobTypes
{
+ [XamlVector("M52.59 0.016c-0.091 0.015-8.775 1.777-6.857 13.441c0.697 4.25 0.333 7.447-0.327 9.738 c-0.153 0.529-0.474 0.533-0.7 0.031C41.145 15.372 33.239 9.894 24.07 9.894c-12.488 0-22.649 10.16-22.649 22.647 c0 5.537 2 10.611 5.311 14.551c3.359 3.988 8.047 6.8 13.371 7.744c0.543 0.097 0.999 0.166 1.014 0.183 c0.014 0.014 0.035 0.019 0.048 0.006c0.013-0.015 0.467 0.037 1.017 0.084c0.623 0.056 1.253 0.084 1.89 0.084 c12.489 0 22.649-10.162 22.649-22.649c0-1.566-0.162-3.095-0.467-4.572c-0.111-0.541-0.004-1.365 0.229-1.865 c1.188-2.562 2.243-6.771 1.224-12.973c-1.592-9.684 4.975-11.098 5.249-11.15c0.543-0.102 0.9-0.625 0.8-1.168 C53.654 0.274 53.14-0.082 52.59 0.016z M33.746 13.964c0.852 0.445 1.667 0.943 2.443 1.496c0.449 0.32 0.49 0.922 0.097 1.309 c-0.396 0.389-0.797 0.768-1.204 1.137c-0.408 0.371-0.988 0.283-1.217-0.219c-0.346-0.756-0.695-1.799-0.9-3.17 C32.883 13.97 33.258 13.71 33.746 13.964z M27.723 12.922c0.083-0.545 0.632-0.901 1.169-0.774c0.32 0.076 0.637 0.16 0.95 0.25 c0.53 0.154 0.969 0.75 1.016 1.299c0.209 2.43 0.828 4.154 1.415 5.289c0.254 0.49 0.153 1.139-0.286 1.471 c-0.449 0.338-0.9 0.664-1.355 0.981c-0.453 0.316-1.076 0.189-1.343-0.295C28.345 19.436 27.176 16.473 27.723 12.922z M22.186 12.655c0.048-0.551 0.504-1.031 0.994-1.059c0.294-0.016 0.59-0.025 0.888-0.025c0.312 0 0.622 0.01 0.929 0.025 c0.515 0.029 0.825 0.505 0.741 1.05c-0.643 4.18 0.742 7.613 1.855 9.576c0.272 0.481 0.139 1.086-0.339 1.365 c-0.483 0.281-0.97 0.555-1.455 0.818c-0.485 0.262-1.127 0.092-1.392-0.395C23.307 21.992 21.724 18.047 22.186 12.655z M17.976 12.497c0.426-0.131 0.857-0.25 1.295-0.353c0.537-0.129 0.929 0.238 0.891 0.789c-0.39 5.629 1.227 9.746 2.442 11.973 c0.265 0.486 0.101 1.057-0.403 1.283c-0.533 0.24-1.063 0.469-1.591 0.688c-0.51 0.212-1.122-0.026-1.338-0.536l0 0 c-0.963-2.266-2.424-6.709-2.284-12.529C17.002 13.261 17.448 12.66 17.976 12.497z M12.365 15.179 c0.559-0.379 1.138-0.73 1.734-1.055c0.485-0.264 0.877-0.01 0.877 0.543c0.008 5.695 1.42 10.033 2.42 12.389 c0.216 0.508-0.01 1.065-0.532 1.244c-0.554 0.191-1.1 0.371-1.637 0.541c-0.526 0.166-1.221-0.067-1.488-0.552 c-0.939-1.693-2.278-5.226-2.21-11.531C11.535 16.205 11.907 15.488 12.365 15.179z M7.357 19.9 c0.459-0.602 0.95-1.178 1.471-1.729c0.379-0.4 0.704-0.261 0.721 0.292c0.154 5.195 1.251 8.475 2.215 10.377 c0.249 0.492 0.055 0.988-0.482 1.123c-0.548 0.137-1.079 0.264-1.59 0.379c-0.538 0.123-1.249-0.146-1.476-0.649 c-0.982-2.184-1.305-6.137-1.404-7.984C6.783 21.158 7.022 20.34 7.357 19.9z M4.69 24.589c0.21-0.512 0.415-0.467 0.458 0.084 c0.176 2.293 0.668 4.087 1.148 5.356c0.195 0.517-0.055 1.004-0.601 1.093c-0.589 0.096-1.108 0.17-1.551 0.229 c-0.547 0.071-0.971-0.326-0.918-0.877C3.429 28.41 3.93 26.435 4.69 24.589z M3.664 37.301c-0.213-0.916-0.363-1.856-0.45-2.813 c-0.05-0.551 0.378-1.041 0.925-1.106c5.164-0.627 21.761-3.496 33.653-15.285c0.394-0.389 0.606-0.805 0.489-0.918 c-0.118-0.113 0.121 0.092 0.514 0.479c0.618 0.609 1.198 1.256 1.736 1.938c0.343 0.433 0.332 1.157-0.014 1.587 C29.634 34.734 10.822 37.607 4.908 38.185C4.359 38.238 3.788 37.84 3.664 37.301z M6.722 44.275 c-0.669-0.983-1.258-2.026-1.754-3.121c-0.228-0.502 0.056-0.955 0.605-1.01c6.594-0.654 24.837-3.668 36.073-17.188 c0.354-0.424 0.854-0.391 1.105 0.1c0.377 0.734 0.715 1.492 1.006 2.273c0.19 0.518 0.071 1.316-0.25 1.766 C36.633 36.644 26.531 41.131 18.65 43.24c-0.533 0.142-1.049 0.25-1.148 0.25c-0.101 0-0.182 0.021-0.181 0.043 c0.001 0.025-0.434 0.15-0.973 0.271c-3.505 0.786-6.38 1.1-8.047 1.223C7.75 45.068 7.032 44.732 6.722 44.275z M13.037 50.362 c-1.236-0.771-2.384-1.668-3.431-2.67c-0.399-0.382-0.259-0.745 0.29-0.804c0.482-0.05 1.012-0.111 1.584-0.189 c0.548-0.071 1.057 0.304 1.178 0.843c0.21 0.928 0.49 1.735 0.797 2.432C13.68 50.477 13.506 50.653 13.037 50.362z M18.761 52.823c-0.387-0.104-0.768-0.219-1.145-0.346c-0.523-0.173-1.208-0.696-1.479-1.18c-0.458-0.812-1.107-2.198-1.514-4.086 c-0.116-0.539 0.261-1.063 0.802-1.174c0.336-0.067 0.68-0.141 1.028-0.217c0.539-0.119 1.017 0.223 1.097 0.77 c0.341 2.345 1.025 4.209 1.709 5.586C19.505 52.67 19.294 52.967 18.761 52.823z M25.493 53.46 c-0.471 0.035-0.945 0.057-1.425 0.057c-0.282 0-0.562-0.01-0.842-0.025c-0.463-0.029-1.121-0.408-1.42-0.873 c-0.767-1.185-1.883-3.373-2.307-6.523c-0.074-0.549 0.324-1.111 0.854-1.266c0.669-0.193 1.351-0.404 2.042-0.634 c0.525-0.172 1.023 0.119 1.131 0.662c0.738 3.72 1.667 6.123 2.464 7.64C26.247 52.984 26.044 53.419 25.493 53.46z M31.623 52.092c-0.643 0.25-1.301 0.467-1.974 0.652c-0.532 0.147-1.252-0.106-1.538-0.58c-0.744-1.232-1.843-3.65-2.68-8.017 c-0.104-0.541 0.237-1.146 0.748-1.354c0.686-0.283 1.375-0.584 2.066-0.904c0.502-0.232 0.944 0.016 1.012 0.564 c0.542 4.375 1.689 6.973 2.688 8.459C32.254 51.37 32.138 51.892 31.623 52.092z M37.388 48.702 c-0.672 0.557-1.379 1.073-2.116 1.545c-0.466 0.297-1.181 0.202-1.503-0.244c-0.875-1.217-2.123-3.732-2.613-8.535 c-0.057-0.549 0.307-1.209 0.785-1.483c0.484-0.276 0.969-0.563 1.449-0.862c0.471-0.291 0.853-0.091 0.901 0.461 c0.332 3.643 1.921 6.217 3.181 7.723C37.827 47.727 37.814 48.35 37.388 48.702z M41.792 43.713 c-0.479 0.754-1.007 1.476-1.575 2.16c-0.353 0.424-0.972 0.437-1.318 0.006c-1.176-1.455-2.672-4.028-2.674-7.696 c0-0.552 0.395-1.267 0.83-1.606c0.51-0.396 1.017-0.807 1.519-1.234c0.421-0.356 0.769-0.209 0.821 0.343 c0.306 3.144 1.393 5.209 2.273 6.401C41.996 42.532 42.088 43.247 41.792 43.713z M43.663 39.995 c-0.196 0.516-0.651 0.567-0.925 0.088c-0.727-1.273-1.464-3.316-1.432-6.324c0.006-0.553 0.353-1.318 0.729-1.723 c0.6-0.646 1.186-1.314 1.753-2.017c0.349-0.429 0.688-0.854 0.771-0.94c0.082-0.089 0.227 0.28 0.3 0.827 c0.114 0.863 0.183 1.742 0.183 2.638C45.041 35.169 44.551 37.676 43.663 39.995z")]
Sewing,
+ [XamlVector("m433.9 382.9v-295.4c0-41.6-34.3-75.9-75.9-75.9h-205c-41.6 0-75.9 34.3-75.9 75.9v10.4h35.4v71.8h32.3v98.8h20.8v-98.8h32.3v-71.8h130v226.8h-270.6v58.3h-41.6v117.6h480.6v-117.7h-62.4zm-255.9-233h-44.7v-52h44.7v52zm-99.9 194.5h270.5v-267.3h-250.7c5.2-26 28.1-45.8 55.1-45.8h205c31.2 0 56.2 25 56.2 56.2v295.5h-336v-38.6zm397.3 135.3h-439v-77h439v77z")]
Embroidery,
}
}
diff --git a/Software/Visual_Studio/Tango.Core/CustomAttributes/XamlVectorAttribute.cs b/Software/Visual_Studio/Tango.Core/CustomAttributes/XamlVectorAttribute.cs
new file mode 100644
index 000000000..fc92eb07c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Core/CustomAttributes/XamlVectorAttribute.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Core.CustomAttributes
+{
+ /// <summary>
+ /// Represents an association of a xaml markup vector to with an enum field.
+ /// </summary>
+ /// <seealso cref="System.Attribute" />
+ [AttributeUsage(AttributeTargets.Field)]
+ public class XamlVectorAttribute : Attribute
+ {
+ /// <summary>
+ /// Gets or sets the xaml vector.
+ /// </summary>
+ public String XamlVector { get; set; }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="XamlVectorAttribute"/> class.
+ /// </summary>
+ /// <param name="xamlVector">The xaml vector.</param>
+ public XamlVectorAttribute(String xamlVector)
+ {
+ XamlVector = xamlVector;
+ }
+ }
+}
diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
index 864f4f797..0ed4e477a 100644
--- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
@@ -71,6 +71,7 @@
<Compile Include="Cryptography\IEncryptor.cs" />
<Compile Include="Cryptography\IHashGenerator.cs" />
<Compile Include="Cryptography\Rfc2898Cryptographer.cs" />
+ <Compile Include="CustomAttributes\XamlVectorAttribute.cs" />
<Compile Include="DI\ITangoIOC.cs" />
<Compile Include="DI\TangoInjectAttribute.cs" />
<Compile Include="DI\TangoIOC.cs" />
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToXamlVectorConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToXamlVectorConverter.cs
new file mode 100644
index 000000000..1ee506de8
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToXamlVectorConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using Tango.Core.CustomAttributes;
+
+namespace Tango.SharedUI.Converters
+{
+ public class EnumToXamlVectorConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ FieldInfo fi = value.GetType().GetField(value.ToString());
+ return fi.GetCustomAttribute<XamlVectorAttribute>().XamlVector;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index 96b011f84..d098ddf95 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -92,6 +92,7 @@
<Compile Include="Converters\DoubleToIntConverter.cs" />
<Compile Include="Converters\EnumToDescriptionConverter.cs" />
<Compile Include="Converters\EnumToItemsSourceConverter.cs" />
+ <Compile Include="Converters\EnumToXamlVectorConverter.cs" />
<Compile Include="Converters\IsEqualConverter.cs" />
<Compile Include="Converters\IsNotConverter.cs" />
<Compile Include="Converters\IsSegmentGradientConverter.cs" />
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs
new file mode 100644
index 000000000..ea464e8db
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.Touch.Controls
+{
+ public class TouchNativeListBox : ListBox
+ {
+
+ /// <summary>
+ /// Gets or sets the ripple factor.
+ /// </summary>
+ public double RippleFactor
+ {
+ get { return (double)GetValue(RippleFactorProperty); }
+ set { SetValue(RippleFactorProperty, value); }
+ }
+ public static readonly DependencyProperty RippleFactorProperty =
+ DependencyProperty.Register("RippleFactor", typeof(double), typeof(TouchNativeListBox), new PropertyMetadata(30.0));
+
+
+
+ /// <summary>
+ /// Gets or sets the scroll viewer.
+ /// </summary>
+ public LightTouchScrollViewer ScrollViewer
+ {
+ get { return (LightTouchScrollViewer)GetValue(ScrollViewerProperty); }
+ set { SetValue(ScrollViewerProperty, value); }
+ }
+ public static readonly DependencyProperty ScrollViewerProperty =
+ DependencyProperty.Register("ScrollViewer", typeof(LightTouchScrollViewer), typeof(TouchNativeListBox), new PropertyMetadata(null));
+
+ public override void OnApplyTemplate()
+ {
+ base.OnApplyTemplate();
+
+ ScrollViewer = GetTemplateChild("PART_ScrollViewer") as LightTouchScrollViewer;
+ }
+
+ protected override void OnMouseUp(MouseButtonEventArgs e)
+ {
+ if (ScrollViewer.IsAfterScrolling) return;
+
+ if (e.ChangedButton == MouseButton.Left)
+ {
+ DependencyObject obj = this.ContainerFromElement((Visual)e.OriginalSource);
+ if (obj != null)
+ {
+ FrameworkElement element = obj as FrameworkElement;
+ if (element != null)
+ {
+ if (SelectedValuePath == null)
+ {
+ ListBoxItem item = element as ListBoxItem;
+ if (item != null && this.Items.Contains(item))
+ {
+ this.SelectedItem = item;
+ }
+ }
+ else
+ {
+ object context = element.DataContext;
+ if (context != null)
+ {
+ SelectedValue = context.GetPropertyValueByPath(SelectedValuePath);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected override void OnPreviewMouseDown(MouseButtonEventArgs e)
+ {
+ e.Handled = true;
+ }
+
+ static TouchNativeListBox()
+ {
+ DefaultStyleKeyProperty.OverrideMetadata(typeof(TouchNativeListBox), new FrameworkPropertyMetadata(typeof(TouchNativeListBox)));
+ }
+ }
+}
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.xaml
new file mode 100644
index 000000000..7d04c902a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.xaml
@@ -0,0 +1,57 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:components="clr-namespace:Tango.Touch.Components"
+ xmlns:local="clr-namespace:Tango.Touch.Controls">
+
+ <ResourceDictionary.MergedDictionaries>
+ <ResourceDictionary Source="../Resources/Colors.xaml" />
+ </ResourceDictionary.MergedDictionaries>
+
+ <Style TargetType="{x:Type local:TouchNativeListBox}">
+ <Setter Property="ItemContainerStyle">
+ <Setter.Value>
+ <Style TargetType="ListBoxItem">
+ <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+ <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+ <Setter Property="Background" Value="Transparent"></Setter>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="ListBoxItem">
+ <components:Ripple RippleBrush="{StaticResource TangoRippleDarkBrush}" RippleFactor="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNativeListBox},Path=RippleFactor}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+ <components:Ripple.Style>
+ <Style TargetType="components:Ripple">
+ <Setter Property="Disabled" Value="False"></Setter>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=local:LightTouchScrollViewer},Path=IsScrolling}" Value="True">
+ <Setter Property="Disabled" Value="True"></Setter>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </components:Ripple.Style>
+ <Border Background="{TemplateBinding Background}">
+ <ContentControl Content="{Binding}" ContentTemplate="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNativeListBox},Path=ItemTemplate}" />
+ </Border>
+ </components:Ripple>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ </Setter.Value>
+ </Setter>
+ <Setter Property="Background" Value="Transparent"/>
+ <Setter Property="BorderThickness" Value="0"/>
+ <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type local:TouchNativeListBox}">
+ <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="1" SnapsToDevicePixels="true">
+ <local:LightTouchScrollViewer x:Name="PART_ScrollViewer">
+ <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+ </local:LightTouchScrollViewer>
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+</ResourceDictionary> \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
index 108726a76..fada6cad8 100644
--- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
+++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
@@ -74,6 +74,7 @@
<Compile Include="Controls\TouchInput.cs" />
<Compile Include="Controls\TouchListBox.cs" />
<Compile Include="Controls\TouchListBoxItem.cs" />
+ <Compile Include="Controls\TouchNativeListBox.cs" />
<Compile Include="Controls\TouchNumericTextBox.cs" />
<Compile Include="Controls\TouchRingProgress.cs" />
<Compile Include="Controls\TouchSlider.cs" />
@@ -129,6 +130,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Controls\TouchNativeListBox.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Controls\TouchNotificationBar.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
diff --git a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
index f8e3eaea5..971f3dd46 100644
--- a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
@@ -37,6 +37,8 @@
<ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchSlider.xaml" />
<ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchStaticListBox.xaml" />
<ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchRingProgress.xaml" />
+ <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchNativeListBox.xaml" />
+
<ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchToggleButton.xaml" />
<ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchButton.xaml" />