Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(gui): new design of fyne-based client: separating basic & vpn settings and add auth token input. #22

Merged
merged 2 commits into from
Feb 7, 2024
Merged

feat(gui): new design of fyne-based client: separating basic & vpn settings and add auth token input. #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eebf68
feat(gui): add a tab for separating basic and vpn settings
genshen Feb 7, 2024
8974e74
feat(gui): add input for accept the proxy auth token
genshen Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions client-ui/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package main

import (
"fmt"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/app"
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/dialog"
"fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget"
resource "github.com/genshen/wssocks-plugin-ustb/client-ui/resources"
Expand Down Expand Up @@ -53,6 +56,7 @@ func main() {
// basic input
uiLocalAddr := &widget.Entry{PlaceHolder: "socks5 listen address", Text: "127.0.0.1:1080"}
uiRemoteAddr := &widget.Entry{PlaceHolder: "wssocks server address"}
uiAuthToken := &widget.Entry{PlaceHolder: "the token for proxy authentication"}
uiHttpEnable := newCheckbox("", false, nil)
uiHttpLocalAddr := &widget.Entry{PlaceHolder: "http listen address", Text: "127.0.0.1:1086"}
uiSkipTSLVerify := newCheckbox("", false, nil)
Expand Down Expand Up @@ -153,17 +157,22 @@ func main() {
return
}

w.SetContent(container.NewVBox(
widget.NewCard("", "Basic",
tabs := container.NewAppTabs(
container.NewTabItemWithIcon(
"Basic",
theme.SettingsIcon(),
&widget.Form{Items: []*widget.FormItem{
{Text: "socks5 address", Widget: uiLocalAddr},
{Text: "remote address", Widget: uiRemoteAddr},
{Text: "auth token", Widget: uiAuthToken},
{Text: "http(s) proxy", Widget: uiHttpEnable},
{Text: "http(s) address", Widget: uiHttpLocalAddr},
{Text: "skip TSL verify", Widget: uiSkipTSLVerify},
}},
), // end group
widget.NewCard("", "USTB VPN",
),
container.NewTabItemWithIcon(
"USTB VPN",
theme.AccountIcon(),
&widget.Form{Items: []*widget.FormItem{
{Text: "enable", Widget: uiVpnEnable},
{Text: "force logout", Widget: uiVpnForceLogout},
Expand All @@ -172,8 +181,14 @@ func main() {
{Text: "username", Widget: uiVpnUsername},
{Text: "password", Widget: uiVpnPassword},
}},
), // end group
),
)
tabs.SetTabLocation(container.TabLocationTop)

w.SetContent(container.NewVBox(
widget.NewCard("Settings", "", tabs),
btnStart,
&widget.Separator{},
container.NewGridWithColumns(2,
container.NewHBox(
NewHyperlinkIcon(resource.GithubIcon(), coreRepoUrl),
Expand All @@ -188,7 +203,16 @@ func main() {
),
container.NewGridWithColumns(2,
widget.NewLabel("v"+pluginversion.VERSION),
NewHyperlinkIcon(theme.HelpIcon(), docUrl),
container.NewHBox(
layout.NewSpacer(),
widget.NewToolbar(
widget.NewToolbarAction(theme.HelpIcon(), func() {
if err := fyne.CurrentApp().OpenURL(docUrl); err != nil {
dialog.ShowError(fmt.Errorf("open link %s failed", docUrl), w)
}
}),
),
),
),
),
))
Expand Down
Loading