code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2025-05-30 23:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

miqt-uic: QAction shortcut keys should not be marked for translation

Browse Source
This commit is contained in:
mappu 2025-05-28 18:25:13 +12:00
parent cb757edcd2
commit ef674bda2f
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/miqt-uic/testdata/qt5_mainwindow_menu.ui.go.expected vendored
View File

@ -27,6 +27,7 @@ func NewMainWindowUi() *MainWindowUi {
ui.MainWindow.Resize(800, 600)
ui.actionNew = qt.NewQAction()
ui.actionNew.SetObjectName("actionNew")
ui.actionNew.SetShortcut(qt.NewQKeySequence2("Ctrl+N"))
ui.actionE_xit = qt.NewQAction()
ui.actionE_xit.SetObjectName("actionE_xit")
ui.centralwidget = qt.NewQWidget(ui.MainWindow.QWidget)
@ -55,7 +56,6 @@ func NewMainWindowUi() *MainWindowUi {
func (ui *MainWindowUi) Retranslate() {
ui.MainWindow.SetWindowTitle(qt.QCoreApplication_Tr("MainWindow"))
ui.actionNew.SetText(qt.QMainWindow_Tr("New..."))
ui.actionNew.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("Ctrl+N")))
ui.actionE_xit.SetText(qt.QMainWindow_Tr("E&xit"))
ui.menu_File.SetTitle(qt.QMenuBar_Tr("&File"))
}

19
cmd/miqt-uic/ui2go.go
View File

@ -71,13 +71,17 @@ func (gs *generateState) collectClassNames_Widget(u *UiWidget) []string {
return ret
}
func (gs *generateState) generateString_noTr(s string) string {
return strconv.Quote(s)
}
func (gs *generateState) generateString(s *UiString, parentClass string) string {
if s.Notr {
return strconv.Quote(s.Value)
return gs.generateString_noTr(s.Value)
} else if parentClass == "" {
return `qt.QCoreApplication_Tr(` + strconv.Quote(s.Value) + `)`
return `qt.QCoreApplication_Tr(` + gs.generateString_noTr(s.Value) + `)`
} else {
return `qt.` + parentClass + `_Tr(` + strconv.Quote(s.Value) + `)`
return `qt.` + parentClass + `_Tr(` + gs.generateString_noTr(s.Value) + `)`
}
}
@ -203,7 +207,12 @@ func (gs *generateState) renderProperties(properties []UiProperty, ret *strings.
customContentsMargins = true
} else if prop.StringVal != nil {
// "windowTitle", "title", "text"
// "windowTitle", "title", "text", "shortcut"
if prop.Name == "shortcut" { // Shouldn't be translatable
prop.StringVal.Notr = true
}
ret.WriteString(`ui.` + targetName + setterFunc + `(` + gs.generateString(prop.StringVal, parentClass) + ")\n")
} else if prop.NumberVal != nil {
@ -543,7 +552,7 @@ func (gs *generateState) generateWidget(w UiWidget, parentName string, parentCla
}
if prop, ok := propertyByName(a.Properties, "shortcut"); ok {
ret.WriteString("ui." + a.Name + `.SetShortcut(qt.NewQKeySequence2(` + gs.generateString(prop.StringVal, w.Class) + `))` + "\n")
ret.WriteString("ui." + a.Name + `.SetShortcut(qt.NewQKeySequence2(` + gs.generateString_noTr(prop.StringVal.Value) + `))` + "\n")
}
if prop, ok := propertyByName(a.Properties, "icon"); ok {