From c658c23b413ce218cf69b744a6eeed43324d515c Mon Sep 17 00:00:00 2001 From: eeeXun Date: Mon, 24 Oct 2022 18:02:57 +0800 Subject: [PATCH] rename & comment --- color.go | 2 +- translator.go | 12 ++++++------ ui.go | 20 ++++++++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/color.go b/color.go index db51818..9b5bdd5 100644 --- a/color.go +++ b/color.go @@ -57,7 +57,7 @@ func NewStyle() *Style { selectedColor: "gray", prefixColor: "cyan", labelColor: "yellow", - pressColor: "cyan", + pressColor: "purple", } } diff --git a/translator.go b/translator.go index c20adf6..03eb863 100644 --- a/translator.go +++ b/translator.go @@ -59,13 +59,13 @@ func (t *Translator) Translate(message string) (string, error) { var data []interface{} var translated string - url_str := fmt.Sprintf( + urlStr := fmt.Sprintf( textURL, LangCode[t.srcLang], LangCode[t.dstLang], url.QueryEscape(message), ) - res, err := http.Get(url_str) + res, err := http.Get(urlStr) if err != nil { return "", err } @@ -81,8 +81,8 @@ func (t *Translator) Translate(message string) (string, error) { if len(data) > 0 { result := data[0] for _, lines := range result.([]interface{}) { - translated_line := lines.([]interface{})[0] - translated += fmt.Sprintf("%v", translated_line) + translatedLine := lines.([]interface{})[0] + translated += fmt.Sprintf("%v", translatedLine) } return translated, nil } @@ -91,12 +91,12 @@ func (t *Translator) Translate(message string) (string, error) { } func (t *Translator) PlaySound(lang string, message string) error { - url_str := fmt.Sprintf( + urlStr := fmt.Sprintf( soundURL, url.QueryEscape(message), LangCode[lang], ) - res, err := http.Get(url_str) + res, err := http.Get(urlStr) if err != nil { t.soundLock.Release() return err diff --git a/ui.go b/ui.go index 168df2d..d7ed9e7 100644 --- a/ui.go +++ b/ui.go @@ -252,7 +252,7 @@ func uiInit() { updateTitle() // handler - mainPage.SetInputCapture(pagesHandler) + mainPage.SetInputCapture(mainpageHandler) langWindow.SetInputCapture(langWindowHandler) styleWindow.SetInputCapture(styleWindowHandler) translateWindow.SetInputCapture(translatePageHandler) @@ -300,11 +300,12 @@ func uiInit() { }) } -func pagesHandler(event *tcell.EventKey) *tcell.EventKey { +func mainpageHandler(event *tcell.EventKey) *tcell.EventKey { key := event.Key() switch key { case tcell.KeyCtrlT: + // Toggle transparent style.Transparent = !style.Transparent updateBackgroundColor() transparentDropDown.SetCurrentOption( @@ -351,6 +352,7 @@ func translatePageHandler(event *tcell.EventKey) *tcell.EventKey { case tcell.KeyCtrlJ: message := srcBox.GetText() if len(message) > 0 { + // Only translate when message exist result, err := translator.Translate(message) if err != nil { dstBox.SetText(err.Error()) @@ -363,20 +365,21 @@ func translatePageHandler(event *tcell.EventKey) *tcell.EventKey { case tcell.KeyCtrlS: translator.srcLang, translator.dstLang = translator.dstLang, translator.srcLang updateTitle() - src_text := srcBox.GetText() - dst_text := dstBox.GetText(false) - if len(dst_text) > 0 { + srcText := srcBox.GetText() + dstText := dstBox.GetText(false) + if len(dstText) > 0 { // GetText of Box contains "\n" if it has words - srcBox.SetText(dst_text[:len(dst_text)-1], true) + srcBox.SetText(dstText[:len(dstText)-1], true) } else { - srcBox.SetText(dst_text, true) + srcBox.SetText(dstText, true) } - dstBox.SetText(src_text) + dstBox.SetText(srcText) case tcell.KeyCtrlO: // Play source sound if translator.soundLock.Available() { message := srcBox.GetText() if len(message) > 0 { + // Only play when message exist translator.soundLock.Acquire() go func() { err := translator.PlaySound(translator.srcLang, message) @@ -392,6 +395,7 @@ func translatePageHandler(event *tcell.EventKey) *tcell.EventKey { if translator.soundLock.Available() { message := dstBox.GetText(false) if len(message) > 0 { + // Only play when message exist translator.soundLock.Acquire() go func() { err := translator.PlaySound(translator.dstLang, message)