From 773cbec6b0ace769cb5a45a41e8574482148eb87 Mon Sep 17 00:00:00 2001 From: mappu Date: Thu, 3 Oct 2024 19:32:17 +1300 Subject: [PATCH] uic: move all setCurrentIndex() calls to end, to match qt uic output --- cmd/miqt-uic/ui2go.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/miqt-uic/ui2go.go b/cmd/miqt-uic/ui2go.go index 6ef3295..d5287c3 100644 --- a/cmd/miqt-uic/ui2go.go +++ b/cmd/miqt-uic/ui2go.go @@ -479,17 +479,24 @@ func New` + u.Class + `Ui() *` + u.Class + `Ui { // Don't emit any of the lines that included .Tr(), move them into the // retranslateUi() function var translateFunc []string + var setCurrentIndex []string for _, line := range strings.Split(nest, "\n") { if strings.Contains(line, `_Tr(`) { translateFunc = append(translateFunc, line) + } else if strings.Contains(line, `.SetCurrentIndex(`) { + setCurrentIndex = append(setCurrentIndex, line) } else { ret.WriteString(line + "\n") } } + ret.WriteString("\nui.Retranslate()\n\n") + + for _, sci := range setCurrentIndex { + ret.WriteString(sci + "\n") + } + ret.WriteString(` - ui.Retranslate() - return ui }