From 19d961626ba5c30b7d063dcd4093bae79e40e016 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Wed, 11 Sep 2019 11:58:04 +0200 Subject: [PATCH] Make the UI look better --- support/hololens/ServoApp/Assets/UI/back.png | Bin 0 -> 1486 bytes .../hololens/ServoApp/Assets/UI/forward.png | Bin 0 -> 1378 bytes .../hololens/ServoApp/Assets/UI/reload.png | Bin 0 -> 3517 bytes support/hololens/ServoApp/Assets/UI/stop.png | Bin 0 -> 1827 bytes support/hololens/ServoApp/BrowserPage.cpp | 6 ++ support/hololens/ServoApp/BrowserPage.xaml | 92 ++++++++++++++++-- support/hololens/ServoApp/ServoApp.vcxproj | 4 + .../ServoApp/ServoApp.vcxproj.filters | 15 +++ 8 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 support/hololens/ServoApp/Assets/UI/back.png create mode 100644 support/hololens/ServoApp/Assets/UI/forward.png create mode 100644 support/hololens/ServoApp/Assets/UI/reload.png create mode 100644 support/hololens/ServoApp/Assets/UI/stop.png diff --git a/support/hololens/ServoApp/Assets/UI/back.png b/support/hololens/ServoApp/Assets/UI/back.png new file mode 100644 index 0000000000000000000000000000000000000000..f22e1abfd2dec34ab71cbc4f339891a08af254a4 GIT binary patch literal 1486 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k1xT_7rilV6mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk?NMQuI!IFnYpwr)1Ch<0a`f6)5S5Q;?~={2eYr2${hcA z{r&IRWiJ*~dm;mZu)i`QQ4vYa$2?W@a|6}|>b9@{?k z@RGXz>_uVm_19%ObIljCpNqD?9XL;O>*Drv;roHC<%^D=3;hpd@GoLNe>vgy#3?0O zRbOOy=PAEzfAR3M@r(Mfr;^=r_U576lr>-8e!+buRimn5c5u(Dgr(mLRDW?3QBgUP=C{UD=d$zvxBlCw5zHQ-1mQMfQ_LeQ!NxU5&jce$v_Y_QWqyUtB*0oG(-9 zb%|HuFU>v9IobbCe({qHPJG&A6G7p9lb@_$wp=seFcU4b(Q1qnJx#r{-WmxeAP`ZPTJxv{v&G| z(6S|`b3HHbT9>|fdE>o{HZQs1*5BFWD4tj3gmcAvp-{t(32v7M}Z>REK zteoV0Me=&_Tpk-j#-^THIvcz0bq$)vZa_7wb>zuiExR|E_H9#F{IcRo#IJa)uuC z*?-LzU+jMVdP4N4lrJ|dU;jV+`^l%(XA_;j>{iWp;h(d=ZrhVhX72sBS@!0gTqD;l zw^g&PBjaJh-!;%(!;>qO#ffxW8MndR%3%+g?0u8oW@v)XRKVQp`p5 zDwC=;y%$&g)BC4B`%A;N?AhyHu2Ngn&IlNS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk?NMQuI!IFnYpy}Cr|hO3bfF`)5S5Q;?~={wi$OyWsZL= zf0q>eVPnU%C88=9xUMZ-sl<`A-G|RC);~WQteEemUczN&AYaa;vR*i@JU;lQ?~xwauIV zdhNWFs;d&*$8GX=sYkzzeD+WI_@Tl%_bw%ub^krHZsuag=E-U|xoUmZX}dSGsry{2 zbH6tCu=+9(^e-KUb+E`jXpnbI~KZnX~iFB#)@%7S&yLta+5x zy;+xq^VXzuKX;$g*Zup2BU#ha>gd90W-3|UR)_i4ZJ%@G`XsNt*NcFr1?~R1xk)9@ zvz0Gg;E3+ZE5E0z6nbj~KM&rn((UF14KqJs8IK2h$Qa_`Q%ZwAah2a+a)S8V;_5}V&)|D)=m>t98^Uv(A-Wcoii z%l>GnU79W!@Vw6NtHBBXeP?+uCiwTJpAlT#zC4>}`aCD!wrrb-DmGKeH;HZ5Uj7SJ zjpr68o;-J9#mDTIl2@L1^{%{Ryy9d^ukq6KfXT*n20ljT=SfYjiL2tfYjQ4yf5Y_d zJ7HB~hR5yd)-dlke*OF_gMM+@$KMmyS2QfV^togwf2HiS{f2WG=6yQ4cgEyB2W)iM z8;fHeeB|=Wxp=Ji^PfkR>R*@5)-UW?edlz;>`hC<=CEzKwSM1x<}aJO-!4_}y>{CB zPTax2cRsDr$#n@`KB?~6O`cE#cadTj!vQ2(e(sngqkbl^_xhba74{tu%T#_Idh7A2 z<@Us-p>K#MJHnVUgPm-VH<+x)r{)YEx z_7$bSJb3Ne&hWi=&pCeEJbCxbXGZZw`@T3p@@-K1Pxhd_y=8XRe2u{3M76{2OC7#SE^>KXu%afqRTm5H&HiMh6ck(Ge~-<+o!C>nC}Q!>*kacihQ7&`^1 wK@wy`aDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0uvp00i_>zopr0Nuq*KL7v# literal 0 HcmV?d00001 diff --git a/support/hololens/ServoApp/Assets/UI/reload.png b/support/hololens/ServoApp/Assets/UI/reload.png new file mode 100644 index 0000000000000000000000000000000000000000..374a66a57a76e810b25e9a95d66f29b6f86f5c1e GIT binary patch literal 3517 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 UtLYWq78C&#A~m8j{M4m?1Ju?l8UO$Q literal 0 HcmV?d00001 diff --git a/support/hololens/ServoApp/BrowserPage.cpp b/support/hololens/ServoApp/BrowserPage.cpp index 1a9b2073bbd..a4d5fcd2a94 100644 --- a/support/hololens/ServoApp/BrowserPage.cpp +++ b/support/hololens/ServoApp/BrowserPage.cpp @@ -28,12 +28,18 @@ void BrowserPage::BindServoEvents() { forwardButton().IsEnabled(forward); }); servoControl().OnLoadStarted([=] { + throbber().IsActive(true); reloadButton().IsEnabled(false); + reloadButton().Visibility(Visibility::Collapsed); stopButton().IsEnabled(true); + stopButton().Visibility(Visibility::Visible); }); servoControl().OnLoadEnded([=] { + throbber().IsActive(false); reloadButton().IsEnabled(true); + reloadButton().Visibility(Visibility::Visible); stopButton().IsEnabled(false); + stopButton().Visibility(Visibility::Collapsed); }); servoControl().OnCaptureGesturesStarted([=] { servoControl().Focus(FocusState::Programmatic); diff --git a/support/hololens/ServoApp/BrowserPage.xaml b/support/hololens/ServoApp/BrowserPage.xaml index 50f5c7972ab..5255b3a4ab5 100644 --- a/support/hololens/ServoApp/BrowserPage.xaml +++ b/support/hololens/ServoApp/BrowserPage.xaml @@ -7,25 +7,105 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> + + + - + - + + + - + + diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 1f2683fe753..2c8ce4ca740 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -948,6 +948,10 @@ + + + + diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters index ab7d443ea8c..b8266255b83 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj.filters +++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters @@ -123,6 +123,18 @@ Assets + + Assets\UI + + + Assets\UI + + + Assets\UI + + + Assets\UI + @@ -876,6 +888,9 @@ {d21a959c-19d1-4a54-b942-692c27e5b3a6} + + {d49fe329-5e22-4470-8310-5b925419e6f8} +