From e723b61e8fd76b40c0e20d3c3c6ef36039a1b64d Mon Sep 17 00:00:00 2001 From: eeeXun Date: Sun, 23 Oct 2022 01:50:13 +0800 Subject: [PATCH] rename --- config.go | 12 ++++++------ translator.go | 8 ++++---- ui.go | 53 ++++++++++++++++++++++++++------------------------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/config.go b/config.go index 02be7d3..5324c9f 100644 --- a/config.go +++ b/config.go @@ -32,8 +32,8 @@ func configInit() { // setup theme = config.GetString("theme") transparent = config.GetBool("transparent") - translator.src_lang = config.GetString("source_language") - translator.dst_lang = config.GetString("destination_language") + translator.srcLang = config.GetString("source_language") + translator.dstLang = config.GetString("destination_language") } func updateConfig() { @@ -47,13 +47,13 @@ func updateConfig() { changed = true config.Set("transparent", transparent) } - if config.GetString("source_language") != translator.src_lang { + if config.GetString("source_language") != translator.srcLang { changed = true - config.Set("source_language", translator.src_lang) + config.Set("source_language", translator.srcLang) } - if config.GetString("destination_language") != translator.dst_lang { + if config.GetString("destination_language") != translator.dstLang { changed = true - config.Set("destination_language", translator.dst_lang) + config.Set("destination_language", translator.dstLang) } if changed { diff --git a/translator.go b/translator.go index 15562b7..8d36d4e 100644 --- a/translator.go +++ b/translator.go @@ -18,8 +18,8 @@ const ( ) type Translator struct { - src_lang string - dst_lang string + srcLang string + dstLang string } func (t Translator) Translate(message string) (string, error) { @@ -28,8 +28,8 @@ func (t Translator) Translate(message string) (string, error) { url_str := fmt.Sprintf( textURL, - LangCode[t.src_lang], - LangCode[t.dst_lang], + LangCode[t.srcLang], + LangCode[t.dstLang], url.QueryEscape(message), ) res, err := http.Get(url_str) diff --git a/ui.go b/ui.go index b10c2a0..91c7498 100644 --- a/ui.go +++ b/ui.go @@ -31,13 +31,14 @@ func updateBackground() { Foreground(window.src.prefix_color)) } -func updateLang() { - src_box.SetTitle(translator.src_lang) - dst_box.SetTitle(translator.dst_lang) - src_dropdown.SetCurrentOption(IndexOf(translator.src_lang, Lang)) - src_dropdown.SetTitle(translator.src_lang) - dst_dropdown.SetCurrentOption(IndexOf(translator.dst_lang, Lang)) - dst_dropdown.SetTitle(translator.dst_lang) +// update title and option +func updateTitle() { + src_box.SetTitle(translator.srcLang) + dst_box.SetTitle(translator.dstLang) + src_dropdown.SetCurrentOption(IndexOf(translator.srcLang, Lang)) + src_dropdown.SetTitle(translator.srcLang) + dst_dropdown.SetCurrentOption(IndexOf(translator.dstLang, Lang)) + dst_dropdown.SetTitle(translator.dstLang) } func uiInit() { @@ -72,18 +73,18 @@ func uiInit() { SetTitleColor(window.dst.border_color) updateBackground() - updateLang() + updateTitle() // handler - pages.SetInputCapture(PagesHandler) - translate_page.SetInputCapture(TranslatePageHandler) - src_dropdown.SetDoneFunc(SrcDropDownHandler). - SetSelectedFunc(SrcSelected) - dst_dropdown.SetDoneFunc(DstDropDownHandler). - SetSelectedFunc(DstSelected) + pages.SetInputCapture(pagesHandler) + translate_page.SetInputCapture(translatePageHandler) + src_dropdown.SetDoneFunc(srcDropDownHandler). + SetSelectedFunc(srcSelected) + dst_dropdown.SetDoneFunc(dstDropDownHandler). + SetSelectedFunc(dstSelected) } -func PagesHandler(event *tcell.EventKey) *tcell.EventKey { +func pagesHandler(event *tcell.EventKey) *tcell.EventKey { key := event.Key() switch key { @@ -102,7 +103,7 @@ func PagesHandler(event *tcell.EventKey) *tcell.EventKey { return event } -func TranslatePageHandler(event *tcell.EventKey) *tcell.EventKey { +func translatePageHandler(event *tcell.EventKey) *tcell.EventKey { key := event.Key() switch key { @@ -118,18 +119,18 @@ func TranslatePageHandler(event *tcell.EventKey) *tcell.EventKey { case tcell.KeyCtrlQ: src_box.SetText("", true) case tcell.KeyCtrlN: - err := translator.PlaySound(translator.src_lang, src_box.GetText()) + err := translator.PlaySound(translator.srcLang, src_box.GetText()) if err != nil { src_box.SetText(err.Error(), true) } case tcell.KeyCtrlP: - err := translator.PlaySound(translator.dst_lang, dst_box.GetText(false)) + err := translator.PlaySound(translator.dstLang, dst_box.GetText(false)) if err != nil { dst_box.SetText(err.Error()) } case tcell.KeyCtrlS: - translator.src_lang, translator.dst_lang = translator.dst_lang, translator.src_lang - updateLang() + translator.srcLang, translator.dstLang = translator.dstLang, translator.srcLang + updateTitle() src_text := src_box.GetText() dst_text := dst_box.GetText(false) if len(dst_text) > 0 { @@ -144,19 +145,19 @@ func TranslatePageHandler(event *tcell.EventKey) *tcell.EventKey { return event } -func SrcSelected(text string, index int) { - translator.src_lang = text +func srcSelected(text string, index int) { + translator.srcLang = text src_box.SetTitle(text) src_dropdown.SetTitle(text) } -func DstSelected(text string, index int) { - translator.dst_lang = text +func dstSelected(text string, index int) { + translator.dstLang = text dst_box.SetTitle(text) dst_dropdown.SetTitle(text) } -func SrcDropDownHandler(key tcell.Key) { +func srcDropDownHandler(key tcell.Key) { switch key { case tcell.KeyTAB: app.SetFocus(dst_dropdown) @@ -165,7 +166,7 @@ func SrcDropDownHandler(key tcell.Key) { } } -func DstDropDownHandler(key tcell.Key) { +func dstDropDownHandler(key tcell.Key) { switch key { case tcell.KeyTAB: app.SetFocus(src_dropdown)