From b1cee1ac5516dd3f77a7aed404cb807e59de96bf Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Sat, 6 Jun 2020 14:44:49 -0500 Subject: [PATCH] Update qfont.ttf with QLab3Icons --- Droid/Assets/qfont.ttf | Bin 14532 -> 17696 bytes iOS/Resources/qfont.ttf | Bin 14532 -> 17696 bytes .../Classes/QItems/QCueList.cs | 2 +- .../Classes/Settings/QIcon.cs | 68 +++++++++--------- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/Droid/Assets/qfont.ttf b/Droid/Assets/qfont.ttf index 35c6f703471ae5721fb4ecbe373d31ff3a2cdbe8..46723c1f492cc076072f27c278e02432ef646ef8 100755 GIT binary patch delta 5147 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 delta 1774 zcmZ`(T}&KR6#nka>;Sv`i3ln`U7)23q+lbpDyae$Yc;k3x|Ny~H+0#BEbPJpK~3Ch zv>I$p+o^wjFg{>|NgqtMebDsD7!wm;Oqyt8((q9ACXmQtOo$Q3@6KFWU!2W1=R4=j z+&T9<=kBKq;+v@~1b{M}go*Ui14nwo@9ubok-v$-Lj&!*_caWR0pc+I$jC%AeYLgi z6Z%Vld1+*BCT#!c8bI4+=EI}u_{74wvqSX12SVw1G?Qk$oc`5?E_=0tYzIt(cVq#`~cGX>{e}Vq#WNIY(djG-{@IaXU zfr;pR+GsBRh<<{8crrQ>yH)9w(0>OoK2N7IGxLqZO+f3zEP5h69ZUbx-Fgk!+r{Tk zK}2YR=)gW0`}>|7L}@ZQGl~0QF|ID9&VRW`j>V%W)EU8?$_hpV?5(JI+&L|}1|`;C zHT&Ih95V;-p-$593J@mIMsNY~kM|*9gHiR#Hrk*Uw?HXTPZ3R&%1Y;~Sxdd0_sn|d z2eU3NnCkoApQ_B@ixxjZxEJ?v?=`4J9oOB4 zFdERvMQmrvdfPc^%{$Acl`UpL-UKMC@{&eDl`b{-T}Ta90I8w2D>al1QbVaHHCQR6 zhSFMUuzJX%th(`I)JJM?OOP7e9Ha)f38}#iLuzpAkQ!<{r3U4I)Sxhs8k7i91KCPC z8q^JPw+||aweNgTORTN?Yt`^b!)bg9D<}Ua3t_O|4raNw~raGCugf=vf-DPA*4=c+0ygKH$6K}B zyZDYb_Xq@-|0`g7Gp&=JX;LdWSBxjJFfQ?FYHmu`6*1qEZ<_oYF&-!0aNRAg-ZF>$ zoHfT|#Nkmnzb>x)JU$S|#Jsp}8fKprv|h4avzDyYz@Tl}d+ayu<${ZaErtC>PZr$@ z9t>`T=CYx$ijNmxC|)gDDovDKDeo!&!z;E4U#LOiWndI@$WV#8P}+-75!}4JrB23_ zQ0g8)r{)G{_%Y2*#=A9FC$UfS0LM1_tafZBBAN%$iWfBxarRE}00~RY{5U?=Tp%b+ z%?*@_63zL)A!;;oqe0Y&T2UwJ#WoQZ4WdyriS4j6vFP+j!b&G+ jGtNryQh|LUm1MDwv;QFf6{wzYU6eU%<>B0hwGsLkK#xl# diff --git a/iOS/Resources/qfont.ttf b/iOS/Resources/qfont.ttf index 35c6f703471ae5721fb4ecbe373d31ff3a2cdbe8..46723c1f492cc076072f27c278e02432ef646ef8 100755 GIT binary patch delta 5147 zcmaJl3v?9Mb@#s6pLSQf+Ld-kAGF&4S4e0-S`fmLjD!e6fCa1sNC<%h;d{rrFMLrG_6%kW5C#TTeI8yW=BNC zJ)N2N-o5vI=H36Bx$xleCou&G00mSj0G2FS)BfG-r<4FKgu$HF=9VQ8fF6M6-w|$G zxw<->*u2^ZfKL#f*s{BC_=}R;n*oG+qWx^kz7f0X-7KR8Z&1H|>+rVSPd@YXI$Hb- z0NwDmzP-alFQE0_r&hCV*Vj{9AAaF%3cz$8pz7(tfxiCYr$63Hi|J`V?H~~}U5Yme zZzkM5xO-$jo6vU={vnm_T|-;?BCZBn)I^KIPj>h1A7;JmpQvw;aC@?E_rTWg{&f{V z<0=4lVR&foNcrJ+o&{K3L}T6@-cvg;{I5-+N!k>j@VF!m5=PnYt)KQ9>pz1EVVdah zt99CP-oA&={af}tUL09gDgtpU;e+&JLxE0*g{tNUAk5KVJub|4&dEZPCEYug5 z>66rM%Jm6Rf(e(}Cb_=>QqsbAC-2R52+cIG0|tZL^`{t(1?8O{Sn9gQ#0NlK#k`c&e z*g`6!gy&!j7mTnjdxztSeIP2yPB|x6NU&LPV_Lah_*1Tk0-`=^Vh z!#Do^#>d?^=iOX#bM4LjHxJ$X;O57-mfl)*>)~vc1~)<9G~@>T-(#|Wo1H9<6&D*v zjeW*)qsH*xhAG22!-!$fpf@P<-vdnlC38Dbbyu%|+=VKp~|^c)$?k?ktj|6&iKX3FLY@aGo{Z~ z8p)I7s}d?<7mUG&s7Kq~yBpu6dkUvSbl&nI4GLn|d z6cJ-Kv=pgaPH!w)8@Ct;v4(47Q9RP#-rln2x#6K>Yg)XOBQHFJYFz&}9nR5}L&uH{ ztsHfxI?C48bc~F23;-yhpX7a>Oi>L+5TOEmB%7$$siM`)VQZ1f>5YQix+Q9D)GOoI z-?pQzZO1KMwPik$8fKE3A1{kWmqqbM5`rL&%X}&|Z7Hd7Q-5@s#Mw=jVm)AmQh>On z3W=Xc*h;*qW5f?_#ZnZHm|U5bwa195wJocOr{nGIugzkqqkceQXj6uKMOyQHA;1p8 zT&N*w#ra~y2Q4eceDPET8U=ASG46HcSc^qHYF`}xC(`)r)U(g-+R*Ah9MYvD?j5G> z#Ve94R>T8NSGayfGI=zKim?r2xHPh~doZ28l&-}G#@6Z65!X)Bc4si&-kw|`x}4j; zKRCFoVQOsd7`a(*_BZVB*iJ|hpXf13y36fJnL{MTMO5Iq)=0RuHEgwJemw)RIV&?w zMC@OxnTTXgM_PG@hTAccZTyOzU|WFvNEvg*A~D3ak3Pa~-{tAcnF&6I?1!o|q-FuU zWdDUEPqZmSG9RB;Z9pTMxNxkZ4HsfKUStsZ=g-HVqN=!}&goiQv%ha~kyEYm1Vd~0 zn~iR*uC`b(&8cTycV5EpD2*YvH?OR=S}mvC58;!5+8$EMobl+>njhXAxL_U-+K#V_4UrONS0!y1=VLd<$<&DxSeeoDkeu`DOXSyT zFwmlQYk|t{El~Q@5euoY6yeO7ES$lq=bzu##rimW24U>nx$k{%)&?k|qr>E2T^T*z zX5NgRw9G|*iA2uby6_Jxo5Quy6!&hA=qtRt{y$tja^&h^EP3pA&1|#$lFTDVICbZ- z5hOEHa09|$O9rF{9heCtOS8yDRQn=?;jS_1dT{dWo-vl+HnD7?ZDMk=tu1GO_#VwK zfK)L6xmhG8xq8miEliFr_}=8igU&$LpLY43(JF_d$}ur9@$I7Kz@o0MMgEqeZ)2mQ z%IT!j3eRM;DZxmK>gXgvXAg|qkiv%VK8$*mag)y#^UR{KcH8oO|`6UUzzJ$WZ{@{}u7(mB{!5;8ZgXrz~M7wTsp;%#~@ zY1~5s7frqxE6KFs>9>yemi-6YMF9;wB$Qm}S%@)F9h1ULDqPES z$)oQdJ(_&ut+(E2+OT1C!*xMO9wpMgS6=;-?r(N?(+f%D*?$xYh&waoXFr6AKS$VF zP8^1iFXdf?(OOcd93#b94pE0QRLW}c_GGfX>D`Lu$=x;H(o%1#^cRJtrG@6w(ib^e z%DR&6UG2Nip50ANGIOoeEO+1AazDN+ZV_CRDMC<9o3gk}bW_-gSdzL#lp&Z11``;{H3ZUgC)?S{FpR&9~ZcK^cm#-^%piQ1?(t8{`<&=-ZPTAEfjwYgG0b6&C4 z>z!L2-o82N$rBYiYaMQDTecwPEH^uxCY4@W;0-OPYmF<46oN&t6grHWLb2TG353=q zI^s2EgI--~RBF{mrB29ad3sx3f!-Kikm%l8Qxgh$OUtyPyRb}EB(+Z2`}19RP{ zh()WI&t>spXdDgR)`oib!u9KXYD+xmDvd-uuU}+)zM(X_Yd0=z*;!YvFjR$?djqv| zbnM}aWER|gS%P(?$R;TpnOGuY;J!tEM4g+-w~_6GC?Pg71fSDKCSt8XizCKOp^)2- zfr&*nvJ@3JsM`2_tOB_OMQhoVXjU5^D%)PSLgyC6%)guOD^NZ)-yU-t4Gh(SMqlAk zqrz$x8|J3GKX}UPXT@xv5U^GX>hrf8J|+}e1ieR(?`Tm_GObpJ)Y8MzNlAa)|cLC7Fu=BAtsX?gpg@#9<*cz+z&CA^}fTN-Anc%%OCpatJ5P zF1gNoX*2!o(48x+D&q_U@TY$Ns?2$8%pA!fnWgu(|8FNhFtL={@ArT5_5*=H;Ola^ z@%AdB?UxHrHe0Al6Nf&CP#UqJqzCVPNHVAJA$fB(#vB$aIjwc~|gKBk9ao|Me@e>EI>b#>aU%!00(zM9o3KisO z^9n+)uaeRS4nE~@Jaur?BOB5rZB9qxrPNPHW?x*4i+JtI`YSUJR?a{~0+!8YcL;wj zoAen?g9M^ql<5kBKagQ1ods^lunM$T zB*R)rpjU=<;Ki5I*}zVO^wvO(7<~}7!Vn~3gutysNowe)18jqbi0MAqL+HS^hj#T5 z@YRuDr6g$X9{S0$U0TylA4XL$kN!^$?Ag10C~2>$B4pMqRqmDP)4@*K(9Z)Qs&yg1 zZE$2{xURaI?`L4wuA!*Z%_L(NZV? delta 1774 zcmZ`(T}&KR6#nka>;Sv`i3ln`U7)23q+lbpDyae$Yc;k3x|Ny~H+0#BEbPJpK~3Ch zv>I$p+o^wjFg{>|NgqtMebDsD7!wm;Oqyt8((q9ACXmQtOo$Q3@6KFWU!2W1=R4=j z+&T9<=kBKq;+v@~1b{M}go*Ui14nwo@9ubok-v$-Lj&!*_caWR0pc+I$jC%AeYLgi z6Z%Vld1+*BCT#!c8bI4+=EI}u_{74wvqSX12SVw1G?Qk$oc`5?E_=0tYzIt(cVq#`~cGX>{e}Vq#WNIY(djG-{@IaXU zfr;pR+GsBRh<<{8crrQ>yH)9w(0>OoK2N7IGxLqZO+f3zEP5h69ZUbx-Fgk!+r{Tk zK}2YR=)gW0`}>|7L}@ZQGl~0QF|ID9&VRW`j>V%W)EU8?$_hpV?5(JI+&L|}1|`;C zHT&Ih95V;-p-$593J@mIMsNY~kM|*9gHiR#Hrk*Uw?HXTPZ3R&%1Y;~Sxdd0_sn|d z2eU3NnCkoApQ_B@ixxjZxEJ?v?=`4J9oOB4 zFdERvMQmrvdfPc^%{$Acl`UpL-UKMC@{&eDl`b{-T}Ta90I8w2D>al1QbVaHHCQR6 zhSFMUuzJX%th(`I)JJM?OOP7e9Ha)f38}#iLuzpAkQ!<{r3U4I)Sxhs8k7i91KCPC z8q^JPw+||aweNgTORTN?Yt`^b!)bg9D<}Ua3t_O|4raNw~raGCugf=vf-DPA*4=c+0ygKH$6K}B zyZDYb_Xq@-|0`g7Gp&=JX;LdWSBxjJFfQ?FYHmu`6*1qEZ<_oYF&-!0aNRAg-ZF>$ zoHfT|#Nkmnzb>x)JU$S|#Jsp}8fKprv|h4avzDyYz@Tl}d+ayu<${ZaErtC>PZr$@ z9t>`T=CYx$ijNmxC|)gDDovDKDeo!&!z;E4U#LOiWndI@$WV#8P}+-75!}4JrB23_ zQ0g8)r{)G{_%Y2*#=A9FC$UfS0LM1_tafZBBAN%$iWfBxarRE}00~RY{5U?=Tp%b+ z%?*@_63zL)A!;;oqe0Y&T2UwJ#WoQZ4WdyriS4j6vFP+j!b&G+ jGtNryQh|LUm1MDwv;QFf6{wzYU6eU%<>B0hwGsLkK#xl# diff --git a/qController.Standard/Classes/QItems/QCueList.cs b/qController.Standard/Classes/QItems/QCueList.cs index 60865db..1215ef0 100644 --- a/qController.Standard/Classes/QItems/QCueList.cs +++ b/qController.Standard/Classes/QItems/QCueList.cs @@ -18,7 +18,7 @@ namespace qController.QItems { get { - return QIcon.LIST; + return QIcon.GetIconFromType("Group"); } } } diff --git a/qController.Standard/Classes/Settings/QIcon.cs b/qController.Standard/Classes/Settings/QIcon.cs index 4c48783..b987b58 100644 --- a/qController.Standard/Classes/Settings/QIcon.cs +++ b/qController.Standard/Classes/Settings/QIcon.cs @@ -1,4 +1,5 @@ -namespace qController +//Get appropriately letter or unicode character for Icon font +namespace qController { public static class QIcon { @@ -22,16 +23,24 @@ public const string POWER = "\uE810"; public const string QRCODE = "\uE811"; + + public const string MAIL = "\uE812"; + + public const string LEFT_DIR = "\uE813"; + public const string LIST = "\uE814"; + public const string SPIN3 = "\uE832"; public const string MENU = "\uF0C9"; - public const string LIGHTBULB = "\uF0CB"; + public const string LIGHTBULB = "\uF0EB"; public const string MIC = "\uF130"; public const string MINUS_SQUARED = "\uF146"; + public const string DOLLAR = "\uF155"; + public const string RIGHT = "\uF178"; public const string DOT_CIRCLED = "\uF192"; @@ -42,70 +51,65 @@ public const string OBJECT_UNGROUP = "\uF248"; - public const string HOURGLASS_O = "\uF251"; + public const string HOURGLASS_O = "\uF250"; public const string COMMENTING_O = "\uF27B"; - public const string DOLLAR = "\uF155"; - public const string MAIL = "\uE812"; - - public const string LEFT_DIR = "\uE813"; - public const string LIST = "\uE814"; public static string GetIconFromType(string type) { switch (type) { case "Group": - return OBJECT_UNGROUP; + return "g"; case "Audio": - return VOLUME_UP; + return "a"; case "Mic": - return MIC; + return "m"; case "Video": - return VIDEO; + return "v"; case "Camera": - return VIDEOCAM; + return "c"; case "Text": - return "T"; + return "t"; case "Light": return LIGHTBULB; case "Fade": - return SLIDERS; + return "f"; case "Network": - return DOT_CIRCLED; + return "o"; case "MIDI": - return ""; + return "M"; case "MIDI File": - return MUSIC; + return "F"; case "Timecode": - return CLOCK; + return "T"; case "Start": - return PLAY; + return "s"; case "Stop": - return STOP; + return "S"; case "Pause": - return PAUSE; + return "p"; case "Load": - return CHART_PIE; + return "l"; case "Reset": - return UNDO; + return "r"; case "Devamp": - return CW; + return "d"; case "GoTo": - return RIGHT; + return "G"; case "Target": - return TARGET; + return "R"; case "Arm": - return POWER; + return "A"; case "Disarm": - return ""; + return "D"; case "Wait": - return HOURGLASS_O; + return "W"; case "Memo": - return COMMENTING_O; + return "e"; case "Script": - return QRCODE; + return "C"; default: return ""; }