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

miqt-uic: support nested QMenu

Browse Source
This commit is contained in:
mappu 2025-05-04 14:16:50 +12:00
parent 1498f05fa5
commit 66aeefc77a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,18 +12,23 @@ var (
DefaultGridMargin = 11 DefaultGridMargin = 11
DefaultSpacing = 6 DefaultSpacing = 6
IconCounter = 0 IconCounter = 0
trackWidgetClasses map[string]string
) )
func collectClassNames_Widget(u *UiWidget) []string { func collectClassNames_Widget(u *UiWidget) []string {
var ret []string var ret []string
if u.Name != "" { if u.Name != "" {
ret = append(ret, u.Name+" *qt."+u.Class) ret = append(ret, u.Name+" *qt."+u.Class)
trackWidgetClasses[u.Name] = u.Class
} }
for _, w := range u.Widgets { for _, w := range u.Widgets {
ret = append(ret, collectClassNames_Widget(&w)...) ret = append(ret, collectClassNames_Widget(&w)...)
} }
if u.Layout != nil { if u.Layout != nil {
ret = append(ret, u.Layout.Name+" *qt."+u.Layout.Class) ret = append(ret, u.Layout.Name+" *qt."+u.Layout.Class)
trackWidgetClasses[u.Name] = u.Class
for _, li := range u.Layout.Items { for _, li := range u.Layout.Items {
if li.Widget != nil { if li.Widget != nil {
ret = append(ret, collectClassNames_Widget(li.Widget)...) ret = append(ret, collectClassNames_Widget(li.Widget)...)
@ -492,10 +497,19 @@ func generateWidget(w UiWidget, parentName string, parentClass string, useQt6 bo
if w.Class == "QMenuBar" { if w.Class == "QMenuBar" {
ret.WriteString("ui." + w.Name + ".AddMenu(ui." + a.Name + ")\n") ret.WriteString("ui." + w.Name + ".AddMenu(ui." + a.Name + ")\n")
} else if w.Class == "QMenu" || w.Class == "QToolBar" { } else if w.Class == "QMenu" || w.Class == "QToolBar" {
// QMenu has its own .AddAction() implementation that takes plain string
// That's convenient, but it shadows the AddAction version that takes a QAction* // It's possible this is a nested menu, then we need to call AddMenu insted
// We need to use the underlying QWidget.AddAction explicitly // Resolve the class type of a.Name
ret.WriteString("ui." + w.Name + ".QWidget.AddAction(ui." + a.Name + ")\n") if aClass, ok := trackWidgetClasses[a.Name]; ok && aClass == "QMenu" {
// Nested
ret.WriteString("ui." + w.Name + ".AddMenu(ui." + a.Name + ")\n")
} else {
// QMenu has its own .AddAction() implementation that takes plain string
// That's convenient, but it shadows the AddAction version that takes a QAction*
// We need to use the underlying QWidget.AddAction explicitly
ret.WriteString("ui." + w.Name + ".QWidget.AddAction(ui." + a.Name + ")\n")
}
} else { } else {
ret.WriteString("ui." + w.Name + ".AddAction(ui." + a.Name + ")\n") ret.WriteString("ui." + w.Name + ".AddAction(ui." + a.Name + ")\n")
} }
@ -513,6 +527,7 @@ func generateWidget(w UiWidget, parentName string, parentClass string, useQt6 bo
func generate(packageName string, goGenerateArgs string, u UiFile, useQt6 bool) ([]byte, error) { func generate(packageName string, goGenerateArgs string, u UiFile, useQt6 bool) ([]byte, error) {
trackWidgetClasses = make(map[string]string)
ret := strings.Builder{} ret := strings.Builder{}
// Update globals for layoutdefault, if present // Update globals for layoutdefault, if present