diff options
author | Alexander Neumann <an2048@gmail.com> | 2019-07-25 15:12:04 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-07-29 09:45:07 +0200 |
commit | 0dce279a896c604054f835ac921faa20af26b610 (patch) | |
tree | b267dbf46cd412aa6f13b7d87ca7a586aed08d84 /ui/updatepage.go | |
parent | ui: use now exposed ItemCountChanged event (diff) | |
download | wireguard-windows-0dce279a896c604054f835ac921faa20af26b610.tar.xz wireguard-windows-0dce279a896c604054f835ac921faa20af26b610.zip |
ui: improve error handling
Signed-off-by: Alexander Neumann <an2048@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/updatepage.go')
-rw-r--r-- | ui/updatepage.go | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/ui/updatepage.go b/ui/updatepage.go index 95657798..9e73781f 100644 --- a/ui/updatepage.go +++ b/ui/updatepage.go @@ -19,12 +19,16 @@ type UpdatePage struct { } func NewUpdatePage() (*UpdatePage, error) { - up := &UpdatePage{} var err error + var disposables walk.Disposables + defer disposables.Treat() + + up := &UpdatePage{} if up.TabPage, err = walk.NewTabPage(); err != nil { return nil, err } + disposables.Add(up) up.SetTitle("An Update is Available!") @@ -33,18 +37,30 @@ func NewUpdatePage() (*UpdatePage, error) { up.SetLayout(walk.NewVBoxLayout()) - instructions, _ := walk.NewTextLabel(up) + instructions, err := walk.NewTextLabel(up) + if err != nil { + return nil, err + } instructions.SetText("An update to WireGuard is available. It is highly advisable to update without delay.") instructions.SetMinMaxSize(walk.Size{1, 0}, walk.Size{0, 0}) - status, _ := walk.NewTextLabel(up) + status, err := walk.NewTextLabel(up) + if err != nil { + return nil, err + } status.SetText("Status: Waiting for user") status.SetMinMaxSize(walk.Size{1, 0}, walk.Size{0, 0}) - bar, _ := walk.NewProgressBar(up) + bar, err := walk.NewProgressBar(up) + if err != nil { + return nil, err + } bar.SetVisible(false) - button, _ := walk.NewPushButton(up) + button, err := walk.NewPushButton(up) + if err != nil { + return nil, err + } updateIcon, _ := loadSystemIcon("shell32", 46, 32) button.SetImage(updateIcon) button.SetText("Update Now") @@ -113,5 +129,7 @@ func NewUpdatePage() (*UpdatePage, error) { }) }) + disposables.Spare() + return up, nil } |