diff -r 64ded9f6a6c6 -r 6606616eca9f ui/qt/button.cpp
--- a/ui/qt/button.cpp	Tue Feb 25 21:11:00 2025 +0100
+++ b/ui/qt/button.cpp	Sat Apr 05 16:46:11 2025 +0200
@@ -30,57 +30,193 @@
 #include "container.h"
 #include "toolkit.h"
 
-UIWIDGET ui_button(UiObject *obj, char *label, ui_callback f, void *data) {
-    QString str = QString::fromUtf8(label);
+UIWIDGET ui_button_create(UiObject* obj, UiButtonArgs args) {
+    UiContainerPrivate *ctn = ui_obj_container(obj);
+    UI_APPLY_LAYOUT(ctn->layout, args);
+    
+    QString str = QString::fromUtf8(args.label);
     QPushButton *button = new QPushButton(str);
     
-    if(f) {
-        UiEventWrapper *event = new UiEventWrapper(obj, f, data);
+    if(args.onclick) {
+        UiEventWrapper *event = new UiEventWrapper(obj, args.onclick, args.onclickdata);
         button->connect(button, SIGNAL(clicked()), event, SLOT(slot()));
+        button->connect(button, SIGNAL(destroyed()), event, SLOT(destroy()));
     }
     
-    UiContainer *ct = uic_get_current_container(obj);
-    ct->add(button, false);
+    ctn->add(button, false);
+    
+    return button;
+}
+
+static void togglebutton_event(UiEvent *event, UiEventWrapper *wrapper) {
+    QPushButton *button = (QPushButton*)wrapper->customdata1;
+    event->intval = button->isChecked();
+    if(wrapper->var) {
+        event->eventdata = wrapper->var->value;
+    }
+}
+
+UIWIDGET ui_togglebutton_create(UiObject* obj, UiToggleArgs args) {
+    UiContainerPrivate *ctn = ui_obj_container(obj);
+    UI_APPLY_LAYOUT(ctn->layout, args);
+    
+    QString str = QString::fromUtf8(args.label);
+    QPushButton *button = new QPushButton(str);
+    button->setCheckable(true);
+    
+    UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args.value, args.varname, UI_VAR_INTEGER);
+    
+    if(args.onchange) {
+        UiEventWrapper *event = new UiEventWrapper(obj, args.onchange, args.onchangedata);
+        event->var = var;
+        event->customdata1 = button;
+        event->prepare_event = togglebutton_event;
+        button->connect(button, SIGNAL(clicked()), event, SLOT(slot()));
+        button->connect(button, SIGNAL(destroyed()), event, SLOT(destroy()));
+    }
+    
+    if(var) {
+        UiInteger *i = (UiInteger*)var->value;
+        
+        if(i->value) {
+            button->setChecked(true);
+        }
+        
+        i->obj = button;
+        i->get = ui_togglebutton_get;
+        i->set = ui_togglebutton_set;
+    }
+    
+    ctn->add(button, false);
     
     return button;
 }
 
+int64_t ui_togglebutton_get(UiInteger *value) {
+    QPushButton *button = (QPushButton*)value->obj;
+    value->value = button->isChecked();
+    return value->value;
+}
+
+void ui_togglebutton_set(UiInteger *value, int64_t i) {
+    QPushButton *button = (QPushButton*)value->obj;
+    value->value = i;
+    if(i != 0) {
+        button->setChecked(true);
+    }
+}
+
+static void checkbox_event(UiEvent *event, UiEventWrapper *wrapper) {
+    QPushButton *button = (QPushButton*)wrapper->customdata1;
+    event->intval = button->isChecked();
+    if(wrapper->var) {
+        event->eventdata = wrapper->var->value;
+    }
+}
 
 
-// TODO: checkbox
+UIWIDGET ui_checkbox_create(UiObject* obj, UiToggleArgs args) {
+    UiContainerPrivate *ctn = ui_obj_container(obj);
+    UI_APPLY_LAYOUT(ctn->layout, args);
+    
+    QString str = QString::fromUtf8(args.label);
+    QCheckBox *checkbox = new QCheckBox(str);
+    
+    UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args.value, args.varname, UI_VAR_INTEGER);
+    
+    if(args.onchange) {
+        UiEventWrapper *event = new UiEventWrapper(obj, args.onchange, args.onchangedata);
+        event->var = var;
+        event->customdata1 = checkbox;
+        event->prepare_event = checkbox_event;
+        checkbox->connect(checkbox, SIGNAL(clicked()), event, SLOT(slot()));
+        checkbox->connect(checkbox, SIGNAL(destroyed()), event, SLOT(destroy()));
+    }
+    
+    if(var) {
+        UiInteger *i = (UiInteger*)var->value;
+        
+        if(i->value) {
+            checkbox->setChecked(true);
+        }
+        
+        i->obj = checkbox;
+        i->get = ui_checkbox_get;
+        i->set = ui_checkbox_set;
+    }
+    
+    ctn->add(checkbox, false);
+    
+    return checkbox;
+}
+
+int64_t ui_checkbox_get(UiInteger *value) {
+    QPushButton *button = (QPushButton*)value->obj;
+    value->value = button->isChecked();
+    return value->value;
+}
+
+void ui_checkbox_set(UiInteger *value, int64_t i) {
+    QPushButton *button = (QPushButton*)value->obj;
+    value->value = i;
+    if(i != 0) {
+        button->setChecked(true);
+    }
+}
 
 
-UIWIDGET ui_radiobutton(UiObject *obj, char *label, UiInteger *rgroup)  {
-    QString str = QString::fromUtf8(label);
+static void radiobutton_event(UiEvent *event, UiEventWrapper *wrapper) {
+    if(wrapper->var) {
+        UiInteger *value = wrapper->var->value;
+        event->eventdata = value;
+        event->intval = ui_get(value);
+    }
+}
+
+UIWIDGET ui_radiobutton_create(UiObject *obj, UiToggleArgs args) {
+    UiContainerPrivate *ctn = ui_obj_container(obj);
+    UI_APPLY_LAYOUT(ctn->layout, args);
+    
+    QString str = QString::fromUtf8(args.label);
     QRadioButton *button = new QRadioButton(str);
     button->setAutoExclusive(false);
     
-    if(rgroup) {
-        QButtonGroup *buttonGroup = (QButtonGroup*)rgroup->obj;
+    UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args.value, args.varname, UI_VAR_INTEGER);
+    if(var) {
+        UiInteger *value = (UiInteger*)var->value;
+        QButtonGroup *buttonGroup = (QButtonGroup*)value->obj;
         if(!buttonGroup) {
             buttonGroup = new QButtonGroup();
-            rgroup->obj = buttonGroup;
+            value->obj = buttonGroup;
+        }
+        int id = buttonGroup->buttons().size()+1;
+        buttonGroup->addButton(button, id);
+        if(value->value == id) {
             button->setChecked(true);
         }
-        buttonGroup->addButton(button, buttonGroup->buttons().size());
-        
-        rgroup->get = ui_radiobutton_get;
-        rgroup->set = ui_radiobutton_set;
+        value->get = ui_radiobutton_get;
+        value->set = ui_radiobutton_set;
     }
     
-    UiContainer *ct = uic_get_current_container(obj);
-    ct->add(button, false);
+    UiEventWrapper *event = new UiEventWrapper(obj, args.onchange, args.onchangedata);
+    event->var = var;
+    event->customdata1 = button;
+    event->prepare_event = togglebutton_event;
+    button->connect(button, SIGNAL(clicked()), event, SLOT(slot()));
+    button->connect(button, SIGNAL(destroyed()), event, SLOT(destroy()));
+    
+    ctn->add(button, false);
     
     return button;
 }
 
-int ui_radiobutton_get(UiInteger *value) {
+int64_t ui_radiobutton_get(UiInteger *value) {
     QButtonGroup *buttonGroup = (QButtonGroup*)value->obj;
     value->value = buttonGroup->checkedId();
     return value->value;
 }
 
-void ui_radiobutton_set(UiInteger *value, int i) {
+void ui_radiobutton_set(UiInteger *value, int64_t i) {
     QButtonGroup *buttonGroup = (QButtonGroup*)value->obj;
     QAbstractButton *button = buttonGroup->button(i);
     if(button) {