ui/qt/menu.cpp

changeset 115
e57ca2747782
parent 108
77254bd6dccb
--- a/ui/qt/menu.cpp	Sun Dec 07 20:00:33 2025 +0100
+++ b/ui/qt/menu.cpp	Sat Dec 13 15:58:58 2025 +0100
@@ -38,7 +38,6 @@
 #include "../common/menu.h"
 #include "../ui/properties.h"
 #include "../ui/window.h"
-#include "stock.h"
 #include "container.h"
 
 
@@ -88,8 +87,8 @@
     }
     
     if(states) {
-        size_t nstates = uic_group_array_size(states);
-        uic_add_group_widget_i(obj->ctx, action, (ui_enablefunc)ui_action_enable, states, nstates);
+        size_t nstates = uic_state_array_size(states);
+        uic_add_state_widget_i(obj->ctx, action, (ui_enablefunc)ui_action_enable, states, nstates);
         action->setEnabled(false);
     }
     
@@ -98,7 +97,7 @@
 
 void add_menuitem_widget(QMenu *parent, int i, UiMenuItemI *item, UiObject *obj) {
     UiMenuItem *it = (UiMenuItem*)item;
-    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->groups);
+    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
     parent->addAction(action);
     QObject::connect(action, SIGNAL(triggered()), action, SLOT(trigger()));
 }
@@ -110,7 +109,7 @@
 void add_checkitem_widget(QMenu *parent, int i, UiMenuItemI *item, UiObject *obj) {
     UiMenuCheckItem *it = (UiMenuCheckItem*)item;
     
-    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->groups);
+    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
     parent->addAction(action);
     action->setCheckable(true);
     action->prepare_event = ui_checkableaction_prepare_event;
@@ -130,7 +129,7 @@
 void add_radioitem_widget(QMenu *parent, int index, UiMenuItemI *item, UiObject *obj) {
     UiMenuRadioItem *it = (UiMenuRadioItem*)item;
     
-    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->groups);
+    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
     parent->addAction(action);
     action->setCheckable(true);
     action->prepare_event = ui_actiongroup_prepare_event;

mercurial