comparison: ui/qt/toolbar.cpp
ui/qt/toolbar.cpp
- changeset 576
- dd38b170f9a8
- parent 575
- 50da9696a865
- child 659
- d6baaa93f7be
equal
deleted
inserted
replaced
| 575:50da9696a865 | 576:dd38b170f9a8 |
|---|---|
| 93 action->setIcon(QIcon::fromTheme(item->args.icon)); | 93 action->setIcon(QIcon::fromTheme(item->args.icon)); |
| 94 } | 94 } |
| 95 toolbar->addAction(action); | 95 toolbar->addAction(action); |
| 96 | 96 |
| 97 UiEventWrapper *event = new UiEventWrapper(obj, item->args.onclick, item->args.onclickdata); | 97 UiEventWrapper *event = new UiEventWrapper(obj, item->args.onclick, item->args.onclickdata); |
| 98 action->connect(action, SIGNAL(clicked()), event, SLOT(slot())); | 98 action->connect(action, SIGNAL(triggered()), event, SLOT(slot())); |
| 99 action->connect(action, SIGNAL(destroyed()), event, SLOT(destroy())); | 99 action->connect(action, SIGNAL(destroyed()), event, SLOT(destroy())); |
| 100 } | 100 } |
| 101 | 101 |
| 102 static void toolbar_togglebutton_event(UiEvent *event, UiEventWrapper *wrapper) { | 102 static void toolbar_togglebutton_event(UiEvent *event, UiEventWrapper *wrapper) { |
| 103 QAction *action = (QAction*)wrapper->customdata1; | 103 QAction *action = (QAction*)wrapper->customdata1; |
| 121 UiVar* var = uic_widget_var(obj->ctx, obj->ctx, nullptr, item->args.varname, UI_VAR_INTEGER); | 121 UiVar* var = uic_widget_var(obj->ctx, obj->ctx, nullptr, item->args.varname, UI_VAR_INTEGER); |
| 122 UiEventWrapper *event = new UiEventWrapper(obj, item->args.onchange, item->args.onchangedata); | 122 UiEventWrapper *event = new UiEventWrapper(obj, item->args.onchange, item->args.onchangedata); |
| 123 event->var = var; | 123 event->var = var; |
| 124 event->customdata1 = action; | 124 event->customdata1 = action; |
| 125 event->prepare_event = toolbar_togglebutton_event; | 125 event->prepare_event = toolbar_togglebutton_event; |
| 126 action->connect(action, SIGNAL(clicked()), event, SLOT(slot())); | 126 action->connect(action, SIGNAL(triggered()), event, SLOT(slot())); |
| 127 action->connect(action, SIGNAL(destroyed()), event, SLOT(destroy())); | 127 action->connect(action, SIGNAL(destroyed()), event, SLOT(destroy())); |
| 128 } | 128 } |
| 129 | 129 |
| 130 void ui_toolbar_add_menu(UiObject *obj, QToolBar *toolbar, UiToolbarMenuItem *item) { | 130 void ui_toolbar_add_menu(UiObject *obj, QToolBar *toolbar, UiToolbarMenuItem *item) { |
| 131 | 131 |
