Commit ed7e5c16 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: fixed missing menu callbacks.

parent ceef030e
...@@ -221,7 +221,7 @@ void XttQtWidget::activate_print() ...@@ -221,7 +221,7 @@ void XttQtWidget::activate_print()
return; return;
} }
activate_print(); xtt->activate_print();
} }
void XttQt::print() void XttQt::print()
...@@ -265,7 +265,7 @@ void XttQtWidget::activate_find() ...@@ -265,7 +265,7 @@ void XttQtWidget::activate_find()
return; return;
} }
activate_find(); xtt->activate_find();
} }
void XttQtWidget::activate_findregex() void XttQtWidget::activate_findregex()
...@@ -274,7 +274,7 @@ void XttQtWidget::activate_findregex() ...@@ -274,7 +274,7 @@ void XttQtWidget::activate_findregex()
return; return;
} }
activate_findregex(); xtt->activate_findregex();
} }
void XttQtWidget::activate_findnext() void XttQtWidget::activate_findnext()
...@@ -283,7 +283,7 @@ void XttQtWidget::activate_findnext() ...@@ -283,7 +283,7 @@ void XttQtWidget::activate_findnext()
return; return;
} }
activate_findnext(); xtt->activate_findnext();
} }
void XttQtWidget::activate_collapse() void XttQtWidget::activate_collapse()
...@@ -292,7 +292,7 @@ void XttQtWidget::activate_collapse() ...@@ -292,7 +292,7 @@ void XttQtWidget::activate_collapse()
return; return;
} }
activate_collapse(); xtt->activate_collapse();
} }
void XttQtWidget::activate_openobject() void XttQtWidget::activate_openobject()
...@@ -301,7 +301,7 @@ void XttQtWidget::activate_openobject() ...@@ -301,7 +301,7 @@ void XttQtWidget::activate_openobject()
return; return;
} }
activate_openobject(); xtt->activate_openobject();
} }
void XttQtWidget::activate_openplc() void XttQtWidget::activate_openplc()
...@@ -310,7 +310,7 @@ void XttQtWidget::activate_openplc() ...@@ -310,7 +310,7 @@ void XttQtWidget::activate_openplc()
return; return;
} }
activate_openplc(); xtt->activate_openplc();
} }
void XttQtWidget::activate_showcrossref() void XttQtWidget::activate_showcrossref()
...@@ -328,7 +328,7 @@ void XttQtWidget::activate_opengraph() ...@@ -328,7 +328,7 @@ void XttQtWidget::activate_opengraph()
return; return;
} }
activate_opengraph(); xtt->activate_opengraph();
} }
void XttQtWidget::activate_collect_insert() void XttQtWidget::activate_collect_insert()
...@@ -337,7 +337,7 @@ void XttQtWidget::activate_collect_insert() ...@@ -337,7 +337,7 @@ void XttQtWidget::activate_collect_insert()
return; return;
} }
activate_collect_insert(); xtt->activate_collect_insert();
} }
void XttQtWidget::activate_collect_show() void XttQtWidget::activate_collect_show()
...@@ -442,7 +442,7 @@ void XttQtWidget::activate_advanceduser() ...@@ -442,7 +442,7 @@ void XttQtWidget::activate_advanceduser()
return; return;
} }
activate_advanceduser(); xtt->activate_advanceduser();
} }
void XttQtWidget::activate_zoom_in() void XttQtWidget::activate_zoom_in()
...@@ -466,7 +466,7 @@ void XttQtWidget::activate_help() ...@@ -466,7 +466,7 @@ void XttQtWidget::activate_help()
return; return;
} }
activate_help(); xtt->activate_help();
} }
void XttQtWidget::activate_help_project() void XttQtWidget::activate_help_project()
...@@ -475,7 +475,7 @@ void XttQtWidget::activate_help_project() ...@@ -475,7 +475,7 @@ void XttQtWidget::activate_help_project()
return; return;
} }
activate_help_project(); xtt->activate_help_project();
} }
void XttQtWidget::activate_help_navigator() void XttQtWidget::activate_help_navigator()
...@@ -484,7 +484,7 @@ void XttQtWidget::activate_help_navigator() ...@@ -484,7 +484,7 @@ void XttQtWidget::activate_help_navigator()
return; return;
} }
activate_help_navigator(); xtt->activate_help_navigator();
} }
void XttQtWidget::activate_help_proview() void XttQtWidget::activate_help_proview()
...@@ -493,7 +493,7 @@ void XttQtWidget::activate_help_proview() ...@@ -493,7 +493,7 @@ void XttQtWidget::activate_help_proview()
return; return;
} }
activate_help_proview(); xtt->activate_help_proview();
} }
void XttQtWidget::activate_back() void XttQtWidget::activate_back()
...@@ -729,7 +729,7 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts) ...@@ -729,7 +729,7 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
statusbar->show(); statusbar->show();
xnav = new XNavQt(this, xnav_form, "Plant", &brow_widget, xnav = new XNavQt(this, NULL, "Plant", &brow_widget,
(xnav_sStartMenu*)root_menu, opplace_str, op_close_button, &sts); (xnav_sStartMenu*)root_menu, opplace_str, op_close_button, &sts);
xnav->message_cb = &xtt_message_cb; xnav->message_cb = &xtt_message_cb;
xnav->close_cb = &close; xnav->close_cb = &close;
......
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
QWidget* form_widget; QWidget* form_widget;
QLabel* msg_label; QLabel* msg_label;
QLabel* cmd_prompt; QLabel* cmd_prompt;
QWidget* xnav_form; //QWidget* xnav_form;
CoWowFocusTimerQt focustimer; CoWowFocusTimerQt focustimer;
CoWowRecall* cmd_recall; CoWowRecall* cmd_recall;
CoWowRecall* value_recall; CoWowRecall* value_recall;
......
...@@ -332,7 +332,7 @@ XttGeQt::XttGeQt(QWidget* xg_parent_wid, void* xg_parent_ctx, ...@@ -332,7 +332,7 @@ XttGeQt::XttGeQt(QWidget* xg_parent_wid, void* xg_parent_ctx,
QObject::connect(((GraphQt*)graph)->grow_widget, QObject::connect(((GraphQt*)graph)->grow_widget,
SIGNAL(resize_signal(QResizeEvent*)), toplevel, SIGNAL(resize_signal(QResizeEvent*)), toplevel,
SLOT(XttGeQtWidget::action_resize(QResizeEvent*))); SLOT(action_resize(QResizeEvent*)));
// TODO: grow_widget must emit a resize_signal signal in resizeEvent() // TODO: grow_widget must emit a resize_signal signal in resizeEvent()
if (xg_menu) { if (xg_menu) {
......
...@@ -125,6 +125,7 @@ QWidget* XttMethodToolbarQt::build() ...@@ -125,6 +125,7 @@ QWidget* XttMethodToolbarQt::build()
{ {
// Toolbar // Toolbar
m_toolbar_w = new QToolBar(); m_toolbar_w = new QToolBar();
m_toolbar_w->setIconSize(QSize(16, 16));
for (int i = 0; i < GeMethods::opmeth_size; i++) { for (int i = 0; i < GeMethods::opmeth_size; i++) {
if (m_op_method_mask & (1 << i) if (m_op_method_mask & (1 << i)
......
...@@ -380,7 +380,7 @@ XAttQt::XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx, ...@@ -380,7 +380,7 @@ XAttQt::XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
addMenuItem(toplevel, functions, "Change &Value", addMenuItem(toplevel, functions, "Change &Value",
SLOT(activate_change_value()), "CTRL+Q"); SLOT(activate_change_value()), "CTRL+Q");
addMenuItem(toplevel, functions, "C&lose Change Value", addMenuItem(toplevel, functions, "C&lose Change Value",
SLOT(change_value_close()), "CTRL+T"); SLOT(activate_close_changeval()), "CTRL+T");
addMenuItem(toplevel, functions, "Open &Program", SLOT(activate_open_plc()), addMenuItem(toplevel, functions, "Open &Program", SLOT(activate_open_plc()),
"CTRL+L"); "CTRL+L");
addMenuItem(toplevel, functions, "&Display object in Navigator", addMenuItem(toplevel, functions, "&Display object in Navigator",
......
...@@ -49,10 +49,11 @@ XAttNavQt::XAttNavQt(void* xa_parent_ctx, QWidget* xa_parent_wid, ...@@ -49,10 +49,11 @@ XAttNavQt::XAttNavQt(void* xa_parent_ctx, QWidget* xa_parent_wid,
: XAttNav(xa_parent_ctx, xa_type, xa_name, xa_objar, xa_advanced_user, : XAttNav(xa_parent_ctx, xa_type, xa_name, xa_objar, xa_advanced_user,
xa_userdata, status) xa_userdata, status)
{ {
debug_print("\n");
debug_print("creating a scrolledbrowwidgetqt\n"); debug_print("creating a scrolledbrowwidgetqt\n");
form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget); form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
showNow(brow_widget); //showNow(brow_widget);
// Create the root item // Create the root item
*w = form_widget; *w = form_widget;
......
...@@ -84,8 +84,6 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name, ...@@ -84,8 +84,6 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
debug_print("creating a scrolledbrowwidgetqt\n"); debug_print("creating a scrolledbrowwidgetqt\n");
form_widget = scrolledbrowwidgetqt_new(init_brow_base_cb, this, &brow_widget); form_widget = scrolledbrowwidgetqt_new(init_brow_base_cb, this, &brow_widget);
//showNow(brow_widget);
displayed = 1; displayed = 1;
// Create the root item // Create the root item
...@@ -98,16 +96,11 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name, ...@@ -98,16 +96,11 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
logg[i].init(i, (void*)this); logg[i].init(i, (void*)this);
} }
debug_print("creating a scrolledbrowwidgetqt\n");
wow = new CoWowQt(parent_wid); wow = new CoWowQt(parent_wid);
debug_print("creating a scrolledbrowwidgetqt\n");
trace_timerid = wow->timer_new(); trace_timerid = wow->timer_new();
debug_print("creating a scrolledbrowwidgetqt\n");
autoack_timerid = wow->timer_new(); autoack_timerid = wow->timer_new();
debug_print("creating a scrolledbrowwidgetqt\n"); form_widget->setToolTip(fl("xtt_xnav widget"));
*status = 1; *status = 1;
popup_obj = new XNavQtPopupObject(this); popup_obj = new XNavQtPopupObject(this);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment