From f77626490fcc2bac2d25d909ec7438f9f2c289ee Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 29 Dec 2020 15:22:00 +1100 Subject: [PATCH] Support Tray.SetIcon in KitchenSink --- .../kitchensink/frontend/package-lock.json | 6 +- v2/test/kitchensink/frontend/package.json | 2 +- v2/test/kitchensink/frontend/src/App.svelte | 1 + .../kitchensink/frontend/src/MainPage.svelte | 6 +- .../src/pages/Tray/SetIcon/SetIcon.svelte | 55 ++++++++++++++++++ .../frontend/src/pages/Tray/SetIcon/code.go | 26 +++++++++ .../frontend/src/pages/Tray/SetIcon/code.jsx | 6 ++ .../src/pages/Tray/SetIcon/description.txt | 1 + .../frontend/src/pages/Tray/Tray.svelte | 17 ++++++ v2/test/kitchensink/main.go | 5 +- v2/test/kitchensink/tray.go | 30 +++------- v2/test/kitchensink/trayicons/svelte.png | Bin 0 -> 2039 bytes 12 files changed, 123 insertions(+), 32 deletions(-) create mode 100644 v2/test/kitchensink/frontend/src/pages/Tray/SetIcon/SetIcon.svelte create mode 100644 v2/test/kitchensink/frontend/src/pages/Tray/SetIcon/code.go create mode 100644 v2/test/kitchensink/frontend/src/pages/Tray/SetIcon/code.jsx create mode 100644 v2/test/kitchensink/frontend/src/pages/Tray/SetIcon/description.txt create mode 100644 v2/test/kitchensink/frontend/src/pages/Tray/Tray.svelte create mode 100644 v2/test/kitchensink/trayicons/svelte.png diff --git a/v2/test/kitchensink/frontend/package-lock.json b/v2/test/kitchensink/frontend/package-lock.json index 23dc1655..ee1a1a54 100644 --- a/v2/test/kitchensink/frontend/package-lock.json +++ b/v2/test/kitchensink/frontend/package-lock.json @@ -135,9 +135,9 @@ } }, "@wails/runtime": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@wails/runtime/-/runtime-1.2.12.tgz", - "integrity": "sha512-QnmDZhLz58HXatXERglpR5yLelTKHnPYM7XlRTNFrzABXJ2EVTy3wMirbe5aucKKzpYmUNzVFhz3FLkFgWNn2A==", + "version": "1.2.20", + "resolved": "https://registry.npmjs.org/@wails/runtime/-/runtime-1.2.20.tgz", + "integrity": "sha512-UsKFbU+q6p9pW8cddVtUxwtJT/mULtyJCti2kE2wT8kaqfo2fjQueVYHWj0BbRlHgXfkCPcJ2mAPFjqQjvET3g==", "dev": true }, "alphanum-sort": { diff --git a/v2/test/kitchensink/frontend/package.json b/v2/test/kitchensink/frontend/package.json index 539eda3a..ed795c29 100644 --- a/v2/test/kitchensink/frontend/package.json +++ b/v2/test/kitchensink/frontend/package.json @@ -11,7 +11,7 @@ "@rollup/plugin-commonjs": "^11.0.0", "@rollup/plugin-node-resolve": "^7.0.0", "@rollup/plugin-url": "^5.0.1", - "@wails/runtime": "^1.2.12", + "@wails/runtime": "^1.2.20", "focus-visible": "^5.2.0", "halfmoon": "^1.1.1", "postcss": "^8.1.7", diff --git a/v2/test/kitchensink/frontend/src/App.svelte b/v2/test/kitchensink/frontend/src/App.svelte index bb178d7c..304c693d 100644 --- a/v2/test/kitchensink/frontend/src/App.svelte +++ b/v2/test/kitchensink/frontend/src/App.svelte @@ -30,6 +30,7 @@ 'Browser', 'File System', 'Window', + 'Tray', 'System' ]; diff --git a/v2/test/kitchensink/frontend/src/MainPage.svelte b/v2/test/kitchensink/frontend/src/MainPage.svelte index 40fb024a..7fca6319 100644 --- a/v2/test/kitchensink/frontend/src/MainPage.svelte +++ b/v2/test/kitchensink/frontend/src/MainPage.svelte @@ -7,8 +7,9 @@ import Browser from './pages/Browser/Browser.svelte'; import Dialog from './pages/Dialog/Dialog.svelte'; import System from './pages/System/System.svelte'; - import Window from './pages/Window/Window.svelte'; - + import Window from './pages/Window/Window.svelte'; + import Tray from './pages/Tray/Tray.svelte'; +

{$selectedPage || "" }

@@ -20,6 +21,7 @@ {#if $selectedPage == "Dialog"} {/if} {#if $selectedPage == "System"} {/if} {#if $selectedPage == "Window"} {/if} + {#if $selectedPage == "Tray"} {/if} \ No newline at end of file diff --git a/v2/test/kitchensink/main.go b/v2/test/kitchensink/main.go index fe0c5012..b3f3adfe 100644 --- a/v2/test/kitchensink/main.go +++ b/v2/test/kitchensink/main.go @@ -29,9 +29,8 @@ func main() { TitleBar: mac.TitleBarHiddenInset(), Menu: createApplicationMenu(), Tray: &menu.TrayOptions{ - Label: "Hi Go BitBar!", - Icon: "light", - Menu: createApplicationTray(), + Icon: "light", + Menu: createApplicationTray(), }, }, LogLevel: logger.TRACE, diff --git a/v2/test/kitchensink/tray.go b/v2/test/kitchensink/tray.go index 7e3847d7..67c62907 100644 --- a/v2/test/kitchensink/tray.go +++ b/v2/test/kitchensink/tray.go @@ -1,15 +1,11 @@ package main import ( - "fmt" - "github.com/wailsapp/wails/v2/pkg/menu/keys" - "math/rand" - "strconv" - "sync" - "time" - "github.com/wailsapp/wails/v2" "github.com/wailsapp/wails/v2/pkg/menu" + "github.com/wailsapp/wails/v2/pkg/menu/keys" + "strconv" + "sync" ) // Tray struct @@ -55,9 +51,6 @@ func (t *Tray) WailsInit(runtime *wails.Runtime) error { t.runtime.Tray.SetIcon("dark") }) - // Start ticker - go t.startTicker() - return nil } @@ -65,19 +58,6 @@ func (t *Tray) WailsShutdown() { t.done = true } -func (t *Tray) startTicker() { - time.Sleep(1 * time.Second) - ticker := time.NewTicker(1 * time.Second) - for t.done == false { - select { - case <-ticker.C: - r := rand.Intn(100) - t.runtime.Tray.SetLabel(fmt.Sprintf("CPU: %d", r)) - } - } - ticker.Stop() -} - func (t *Tray) incrementcounter() int { t.dynamicMenuCounter++ return t.dynamicMenuCounter @@ -150,6 +130,10 @@ func (t *Tray) removeMenu(_ *menu.MenuItem) { t.runtime.Tray.Update() } +func (t *Tray) SetIcon(trayIconID string) { + t.runtime.Tray.SetIcon(trayIconID) +} + func createApplicationTray() *menu.Menu { trayMenu := &menu.Menu{} trayMenu.Append(menu.Text("Show Window", "Show Window", nil)) diff --git a/v2/test/kitchensink/trayicons/svelte.png b/v2/test/kitchensink/trayicons/svelte.png new file mode 100644 index 0000000000000000000000000000000000000000..1eaf499d3ef92d0df3541f95f9d6bbabbf89a1a6 GIT binary patch literal 2039 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H#=yY1d2`HKAcwIy$lZxy-8q?;K+d7m2+uTM zUj{88n}dO!QHX&Vqyz{V7^N6k!E6SGBt~gCJBv{Rs)h-u#*hI>G6({35u*{9Edpe> zv}ZD~K=sZ5(jedg#6VLabU&rTzmc&H|6fVg?3oVGw3ym^DX&fq_LOGbExU!q>+t zIX_n~F(p4KRj(qq0Hlk-rosxy%uOvxRH(?!$t$+1uvG%9umZ9{!um=IU?nBlwn`Dc z0SeCfMX3sAdIow1N_Jcd3JNwwDQQ+gE^bimK%T8qMoCG5mA-y?dAVM>v0i>ry1t>M zrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP z#GR=XnFyQmilN>DdQcxEqi?8ZppQ)((6ey&q3EheEWoL$Br^?%T_72p+ES9?Ruz;M z<$wbsC0Rc;Cp9-UucR2L&rl!kf1vklKrXj(&drQypJRufhHdoGRiJ71%}>cp zt8_^$Nwou|c3ndwT_ej7SZar8M^b~N8x+u1L8-<0Ii;Y~5t^4-Vh8jpHeqyK&iT0o zMXAN$;4y$|K^8+-?_ZP&jGjc0HJ}&(TY)Twu08_cEIV_Un~(+3HAG_5fGmilAtl+W zxHKs%HMs$R=>BrZ~J}U`#GNl zb?qmgbdiyj<;=|AetY}m)GNyS@9Wz}ecQ4nil@8(o8AerGnaA=By6@uyZ-pZ^|Ev$gwJ5yR5#cV)N&7xwn@dMyn)a7W5iiq}$x z&uFF(`=wv$_F~;nb^p)Vv2&;3f+8EaZU+T}Sj*N(j;W_p8N1f6Tc`5l*RQA@ci(Me z3X4oFIPm!6g{Mzdd)<^@o_|_&C2Omn=!a7~_U`@L_1|dUqaVB3Hs74Xq`abi@7}%r z`>pRj_*%7JtlRY@%Zk&_KR12;S(3`!@Ta40KYt$UqWN>@cFvtU_quk1h2YyKPh5Iy zYHE5OZPiGan$A|&e>6#iuU%7wD{%Ymr9NuSTA#ENN<);49o*Jkf4%u!U|_lM?z?qS z8X_sH7GGR(EXT^nhp2I5}L{9G?CBxl=`KFUzFBEQLAcD^|{Z8)v*ZYVG@tniD-ZmI$&oPyg+$ zuvaHKtE*6>{O4@bL^0nOlk*H=X6Cbf1v_0*c24tBJ$P29wyT#lm!UVNXH#8jqtAjK zMafgShE84quNE+6d+_Kn?u_J9omzbF1n-p8s}(cOrmc)xD|CO7g(u5dAGOI-{FY}H z7f)_GtQe{#npF7vSkaXk{Ts{r%-XmXEnV30*}N@i(c41r5;Ku0%@WsGFRd}&l-u3< zwE6POnuC9A8QeG=_r|Timtk^`m#x`9Cu(W}!~fgQ#m{Z7Jh+Q#c?+oi@^tlcS?83{ F1OT1;xlRB8 literal 0 HcmV?d00001